Merge branch 'master-stander' into master-xlk-test

fhx

2024-09-30 6d667d0eeb1bd32588524156bbbe6f1ea44607fc

Merge branch 'master-stander' into master-xlk-test

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

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

@@ -3,7 +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;
import com.hx.phiappt.common.OperatorConstants;
@@ -340,7 +340,7 @@
        if(appointmentInfo == null){
            throw new TipsException("查询不到预约其他信息！");
        }
        

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

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

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

        return Result.success();