Merge remote-tracking branch 'origin/dev/icss' into debug

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -224,8 +224,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoList.forEach(i -> {
             HisInquiryDTO hisInquiryDTO = new HisInquiryDTO();
             BeanUtil.copyProperties(i, hisInquiryDTO);
-            hisInquiryDTO.setInquiryDate(i.getGmtCreate());
-            hisInquiryDTO.setInquiryTime(i.getGmtCreate());
+            hisInquiryDTO.setInquiryDate(i.getGmtModified());
+            hisInquiryDTO.setInquiryTime(i.getGmtModified());
             hisInquiryDTO.setHospitalDeptName(Optional.ofNullable(hospitalDeptMap.get(i.getHospitalDeptId())).map(t -> t.getName()).orElse(null));
             hisInquiryDTO.setDoctorName(Optional.ofNullable(doctorInfoMap.get(i.getDoctorId())).map(t -> t.getName()).orElse(null));
             PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -207,7 +207,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("return_type", 1)
                 .orderByDesc("order_no");
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo ->dictionaryInfo));
+        Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
         //获取用户信息
         RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
         if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
@@ -240,18 +240,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
-        for (QuestionInfo questionInfo : questionInfoList) {
-            questionInfoMap.put(questionInfo.getId(), questionInfo);
-        }
+        Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo ->questionInfo));
         //获取模板信息
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
-        Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
-        for (ModuleInfo moduleInfo : moduleInfoList) {
-            moduleInfoMap.put(moduleInfo.getId(), moduleInfo);
-        }
+        Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream().collect(Collectors.toMap(ModuleInfo::getId,moduleInfo -> moduleInfo));
         //循环给出参赋值
         for (ModuleDetail moduleDetail : moduleDetailList) {
             getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();