feat:家庭医生初始化

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/RequestGetScheduleForWeekDTO.java

@@ -14,12 +14,19 @@ import java.util.Date;
 @Data
 public class RequestGetScheduleForWeekDTO {
 
+    @ApiModelProperty("医院id")
     private Long hospitalId;
 
+    @ApiModelProperty("部门id")
     private Long deptId;
 
+    @ApiModelProperty("第几周")
     private Integer week;
 
+    @ApiModelProperty("医生id")
+    private String doctorId;
+
+    @ApiModelProperty("医生名称")
     private String doctorName;
 
     @ApiModelProperty("业务类型")

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

@@ -33,6 +33,9 @@ public class ImInfoResVo {
     @ApiModelProperty("医生姓名")
     private String doctorName;
 
+    @ApiModelProperty("医生科室id")
+    private String deptId;
+
     @ApiModelProperty("IM历史消息")
     private List<IMMsgResultVo> iMMsgVo;
 }

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

@@ -9,6 +9,7 @@ import com.ebaiyihui.family.doctor.common.dto.ImAccountReqDTO;
 import com.ebaiyihui.family.doctor.common.dto.ImInfoDetailDocReqDTO;
 import com.ebaiyihui.family.doctor.common.dto.ImInfoListDocReqDTO;
 import com.ebaiyihui.family.doctor.common.vo.*;
+import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants;
 import com.ebaiyihui.family.doctor.server.common.constants.IMInformConstants;
 import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
 import com.ebaiyihui.family.doctor.server.common.enums.StatusEnum;
@@ -134,11 +135,21 @@ public class PatientSignServiceImpl implements PatientSignService {
         BaseResponse<PersonnelInfo> res = doctorCilent.queryPersonnelInfo(queryPersonnelInfoReq);
         if (res.isSuccess()) {
             resVo.setDoctorPortrait(res.getData().getPortrait());
+            resVo.setDeptId(String.valueOf(res.getData().getDeptId()));
         }
 
-        List<String> appointmentId = new ArrayList<>();
-        appointmentId.add(admId);
-        imQueryMsgReqVO.setAppointmentId(appointmentId);
+//        List<String> appointmentId = new ArrayList<>();
+        QueryWrapper<PatientSignEntity> listWrapper = new QueryWrapper<>();
+        PatientSignEntity pg = new PatientSignEntity();
+        pg.setDoctorId(patientSignEntity.getDoctorId());
+        pg.setDeptId(patientSignEntity.getDeptId());
+        pg.setAppCode(CommonConstants.APP_CODE);
+        listWrapper.setEntity(patientSign);
+        listWrapper.in("sign_status", 1, 2);
+        List<PatientSignEntity> patientSignEntities = patientSignMapper.selectList(listWrapper);
+
+//        appointmentId.add(admId);
+        imQueryMsgReqVO.setAppointmentId(patientSignEntities.stream().map(PatientSignEntity::getAdmId).collect(Collectors.toList()));
 
         BaseResponse<List<IMSingleMsgResultVO>> allMsgContent = getAllMsgContent(imQueryMsgReqVO);
 

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

@@ -137,8 +137,9 @@ public class ScheduleRecordServiceImpl implements ScheduleRecordService {
         QueryWrapper<ScheduleRecordEntity> wrapper = new QueryWrapper();
 
         ScheduleRecordEntity entity = new ScheduleRecordEntity();
-        entity.setDeptId(JSON.toJSONString(requestGetScheduleForWeekDTO.getDeptId()));
-        entity.setHospitalId(JSON.toJSONString(requestGetScheduleForWeekDTO.getHospitalId()));
+        entity.setDoctorId(requestGetScheduleForWeekDTO.getDoctorId());
+        entity.setDeptId(String.valueOf(requestGetScheduleForWeekDTO.getDeptId()));
+        entity.setHospitalId(String.valueOf(requestGetScheduleForWeekDTO.getHospitalId()));
         wrapper.setEntity(entity);
         wrapper.between("schedule_date", startDate, endDate);
 
@@ -158,6 +159,8 @@ public class ScheduleRecordServiceImpl implements ScheduleRecordService {
                 QueryWrapper<ScheduleRecordEntity> queryWrapper = new QueryWrapper<>();
                 ScheduleRecordEntity timeIntervalEntity = new ScheduleRecordEntity();
                 timeIntervalEntity.setHospitalId(String.valueOf(requestGetScheduleForWeekDTO.getHospitalId()));
+                timeIntervalEntity.setDoctorId(requestGetScheduleForWeekDTO.getDoctorId());
+                timeIntervalEntity.setDeptId(String.valueOf(requestGetScheduleForWeekDTO.getDeptId()));
                 timeIntervalEntity.setScheduleRange(j);
                 queryWrapper.setEntity(timeIntervalEntity);
                 ScheduleRecordEntity scheduleTimeIntervalEntity = scheduleRecordMapper.selectOne(queryWrapper);