Merge remote-tracking branch 'origin/master-xlk-test' into master-xlk-test

fhx

2024-09-30 4403eda447d5f6e39d4ac3c5be847b823735f391

Merge remote-tracking branch 'origin/master-xlk-test' 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

@@ -341,7 +341,7 @@
        if(appointmentInfo == null){
            throw new TipsException("查询不到预约其他信息！");
        }
        

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