1.合并

fhx

2024-09-30 020a46f4ef8d27d854bdba228ed64510c1309a74

1.合并

 phi_platform_user/src/main/java/com/hx/phip/controller/appointment/AppointmentController.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hx.common.BaseController;
import com.hx.exception.TipsException;
import com.hx.phiappt.util.appointment.AppointmentListUtil;
import com.hx.guide.util.CommonQueryUtil;
import com.hx.mybatisTool.SqlSentence;
@@ -340,7 +341,7 @@
        if(appointmentInfo == null){
            throw new TipsException("查询不到预约其他信息！");
        }

        
        User user = commonService.selectOneByKey(UserMapper.class, appointment.getUserId());
        if(user == null){
            throw new TipsException("查询不到预约用户信息！");
@@ -590,7 +591,7 @@

        //处理预约状态和是否转疗逻辑
        handleStatusAndIsSwitch(dto.getAddMode(), appointment, shop, employee, true, oldInfo);

        
        appointmentV2Service.edit(operatorVo, user, oldInfo, appointment, appointmentInfo, apList, apdnList, doctorTimeList, dnsList);

        return Result.success();