feat:家庭医生初始化

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -117,16 +117,18 @@ public class PatientServiceImpl implements PatientService {
             BeanUtils.copyProperties(oldPatientSignEntity, tempOldPatientSignEntity);
             log.info("tempOldPatientSignEntity={}", tempOldPatientSignEntity);
             log.info("入参查询oldPatientSignEntity={}", oldPatientSignEntity);
+            if (!oldPatientSignEntity.getSignId().equals(0L)) {
+                QueryWrapper<PatientSignEntity> cpsWrapper = new QueryWrapper<>();
+                PatientSignEntity cPatientSign = new PatientSignEntity();
+                cPatientSign.setId(oldPatientSignEntity.getSignId());
+                cpsWrapper.setEntity(cPatientSign);
+                oldPatientSignEntity = patientSignMapper.selectOne(cpsWrapper);
+                log.info("改签查询原始oldPatientSignEntity={}", oldPatientSignEntity);
+
+            }
             // 改签查询原始签约信息
             if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
                 if (!oldPatientSignEntity.getSignId().equals(0L)) {
-                    QueryWrapper<PatientSignEntity> cpsWrapper = new QueryWrapper<>();
-                    PatientSignEntity cPatientSign = new PatientSignEntity();
-                    cPatientSign.setId(oldPatientSignEntity.getSignId());
-                    cpsWrapper.setEntity(cPatientSign);
-                    oldPatientSignEntity = patientSignMapper.selectOne(cpsWrapper);
-                    log.info("改签查询原始oldPatientSignEntity={}", oldPatientSignEntity);
-
                     log.info("signCreateTime={}, signStartTime={}, signEndTime={}", signCreateTime, signStartTime, signEndTime);
                     if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
                         return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
@@ -150,7 +152,7 @@ public class PatientServiceImpl implements PatientService {
             } else if (SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) { // 排班签约信息
                 QueryWrapper<PatientSignEntity> nPsWrapper = new QueryWrapper<>();
                 PatientSignEntity nPatientSign = new PatientSignEntity();
-                nPatientSign.setSignId(!oldPatientSignEntity.getSignId().equals(0L) ? oldPatientSignEntity.getSignId() : oldPatientSignEntity.getId());
+                nPatientSign.setSignId(oldPatientSignEntity.getId());
                 nPatientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
                 nPatientSign.setSignStatus(SignStatus.NORMAL.getValue());
                 nPsWrapper.setEntity(nPatientSign);
@@ -160,7 +162,7 @@ public class PatientServiceImpl implements PatientService {
                 }
 
                 // 查询排班医生信息
-                ScheduleRecordEntity scheduleRecordEntity = getScheduleDoctor(reqVo.getPatientId(), reqVo.getPackageOrderId(), oldPatientSignEntity.getDoctorId());
+                ScheduleRecordEntity scheduleRecordEntity = getScheduleDoctor(reqVo.getPatientId(), reqVo.getPackageOrderId(), tempOldPatientSignEntity.getDoctorId());
                 doctorId = Long.valueOf(scheduleRecordEntity.getDoctorId());
                 doctorName = scheduleRecordEntity.getDoctorName();
                 deptId = Long.valueOf(scheduleRecordEntity.getDeptId());