DESKTOP-0GD05B0\Administrator 2 years ago
parent
commit
affcb78bad

+ 6 - 3
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrControlRuleSever.java

@@ -94,6 +94,7 @@ public class EmrControlRuleSever {
             return patientList;
         }
         Map<String, Map<String, Integer>> messageBody = new LinkedHashMap<>(ruleList.size());
+        Map<String, QualityControlAnalysisOfMedicalRecords> problemMedicalRecords = new LinkedHashMap<>(patientList.size());
 
         for (EmrRule rule : ruleList) {
             List<String> code = dao.selectedEmrCode(rule.getId());
@@ -128,10 +129,12 @@ public class EmrControlRuleSever {
 
                 if (whetherToTimeOut && !whetherToCreate) {
                     str = "超时未创建";
+                    problemMedicalRecords.put(p.getInpatientNo(), p);
                 }
 
                 if (!whetherToTimeOut && !whetherToCreate) {
                     str = "未超时未创建";
+                    problemMedicalRecords.put(p.getInpatientNo(), p);
                 }
 
                 if (StringUtil.notBlank(str)) {
@@ -166,14 +169,14 @@ public class EmrControlRuleSever {
                 sendWxInfoService.sendCorpWxMsg(item, body.toString());
             });
         }
-        return patientList;
+        return new ArrayList<>(problemMedicalRecords.values());
     }
 
     public ResultVo<List<QualityControlAnalysisOfMedicalRecords>> accessToYourOwnPatientMedicalRecords() {
         String str = "refer_physician = '" + TokenUtil.getTokenUserId() + "'";
         List<QualityControlAnalysisOfMedicalRecords> list = dao.selectedPatientsAdmittedAtTheSpecifiedTime(str);
-        getPatientsAdmittedAtTheSpecifiedTime(list, false);
-        return ResultVoUtil.success(list);
+        List<QualityControlAnalysisOfMedicalRecords> issue = getPatientsAdmittedAtTheSpecifiedTime(list, false);
+        return ResultVoUtil.success(issue);
     }
 
     private void medicalRecordData(Map<String, QualityControlAnalysisOfMedicalRecords> retainPatientInformation, QualityControlAnalysisOfMedicalRecords p) {

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -374,7 +374,7 @@ public class YiZhuLuRuServer {
                 throw new BizException(ExceptionEnum.LOGICAL_ERROR, result.getMessage());
             }
             if (!result.getData().get("force").isEmpty()) {
-                throw new BizException(ExceptionEnum.LOGICAL_ERROR, "未通过病案首页质控,无法确认出院类型的医嘱。");
+                throw new BizException(ExceptionEnum.LOGICAL_ERROR, "未通过病案首页质控,无法确认出院医嘱。");
             }
         }
     }