feat:家庭医生初始化

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/ScheduleOfDayVo.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 public class ScheduleOfDayVo {
 
-    private ScheduleTimeSaveListVo scheduleTimeSaveListVo;
+    private List<ScheduleTimeSaveListVo> scheduleTimeSaveListVo;
 
     private List<ScheduleRecordVo> recordVoList;
 }

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

@@ -94,9 +94,8 @@ public class PatientServiceImpl implements PatientService {
         String doctorName = reqVo.getDoctorName();
         Long deptId = reqVo.getDeptId();
         String deptName = reqVo.getDeptName();
-        List<PatientSignEntity> patientSignEntities = new ArrayList<>();
         if (!SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) {
-            patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
+            List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
                     reqVo.getSignStatus(), StatusEnum.IN_CONSULTATION.getValue());
             if (!patientSignEntities.isEmpty()) {
                 return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
@@ -104,10 +103,12 @@ public class PatientServiceImpl implements PatientService {
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
             PatientSignEntity patientSign = new PatientSignEntity();
-            patientSign.setPatientPhone(reqVo.getPhone());
-            patientSign.setPackageOrderId(reqVo.getPackageOrderId());
-            patientSign.setSignStatus(SignStatus.NORMAL.getValue());
-            patientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
+            if (Objects.nonNull(reqVo.getAdmId())) {
+                patientSign.setAdmId(reqVo.getAdmId());
+            }
+            if (Objects.nonNull(reqVo.getSignSeqId())) {
+                patientSign.setId(Long.valueOf(reqVo.getSignSeqId()));
+            }
             psWrapper.setEntity(patientSign);
             PatientSignEntity patientSignEntity = patientSignMapper.selectOne(psWrapper);
             if (Objects.nonNull(patientSignEntity)) {
@@ -121,11 +122,14 @@ public class PatientServiceImpl implements PatientService {
             deptId = Long.valueOf(scheduleRecordEntity.getDeptId());
             deptName = scheduleRecordEntity.getDeptName();
         }
-
+        PatientSignEntity oldPatientSignEntity = new PatientSignEntity();
         // 改签或者排班医生获取签约的id
         if (!SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
-            patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
-                    SignStatus.SIGNED.getValue(), StatusEnum.IN_CONSULTATION.getValue());
+            QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
+            PatientSignEntity patientSign = new PatientSignEntity();
+            patientSign.setAdmId(reqVo.getAdmId());
+            psWrapper.setEntity(patientSign);
+            oldPatientSignEntity = patientSignMapper.selectOne(psWrapper);
         }
 
         // 处理换绑医生
@@ -171,9 +175,9 @@ public class PatientServiceImpl implements PatientService {
         patientSignEntity.setStatus(StatusEnum.IN_CONSULTATION.getValue());
         patientSignEntity.setPackageOrderId(reqVo.getPackageOrderId());
         patientSignEntity.setSignEndTime(signEndTime);
-        log.info("patientSignEntities={}", patientSignEntities);
-        if (!patientSignEntities.isEmpty()) {
-            patientSignEntity.setSignId(patientSignEntities.get(0).getId());
+        log.info("oldPatientSignEntity={}", oldPatientSignEntity);
+        if (Objects.nonNull(oldPatientSignEntity)) {
+            patientSignEntity.setSignId(oldPatientSignEntity.getId());
         }
 
         patientSignMapper.insert(patientSignEntity);

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

@@ -163,13 +163,16 @@ public class ScheduleRecordServiceImpl implements ScheduleRecordService {
                 timeIntervalEntity.setScheduleDate(weekDay);
                 timeIntervalEntity.setScheduleRange(j);
                 queryWrapper.setEntity(timeIntervalEntity);
-                ScheduleRecordEntity scheduleTimeIntervalEntity = scheduleRecordMapper.selectOne(queryWrapper);
-                ScheduleTimeSaveListVo saveListVo = new ScheduleTimeSaveListVo();
+                List<ScheduleRecordEntity> scheduleTimeIntervalEntity = scheduleRecordMapper.selectList(queryWrapper);
+                List<ScheduleTimeSaveListVo> scheduleTimeSaveListVos = new ArrayList<>();
                 if (null != scheduleTimeIntervalEntity) {
+                    scheduleTimeSaveListVos.forEach(scheduleTimeSaveListVo -> {
+                        ScheduleTimeSaveListVo saveListVo = new ScheduleTimeSaveListVo();
                         BeanUtils.copyProperties(scheduleTimeIntervalEntity, saveListVo);
-
+                        scheduleTimeSaveListVos.add(saveListVo);
+                    });
                 }
-                scheduleOfDayVo.setScheduleTimeSaveListVo(saveListVo);
+                scheduleOfDayVo.setScheduleTimeSaveListVo(scheduleTimeSaveListVos);
 
 //                List<ScheduleRecordVo> scheduleRecordVoList = new ArrayList<>();
 //                if (!recordEntityList.isEmpty()) {