Browse Source

1.规则修改bug

hujing 5 years ago
parent
commit
53484c5c98

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0408.java

@@ -24,8 +24,8 @@ public class BEH0408 extends QCCatalogue {
         }
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
         if(structureMap != null){
-//            String name = structureMap.get("联系地址");
-            String name = structureMap.get("户口地址");
+            String name = structureMap.get("联系地址");
+//            String name = structureMap.get("户口地址");
             if(CatalogueUtil.isEmpty(name)){
             if(CatalogueUtil.isEmpty(name)){
                 status.set("-1");
                 status.set("-1");
             }
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0175.java

@@ -33,7 +33,7 @@ public class FIRP0175 extends QCCatalogue {
                 return;
                 return;
             }
             }
             String firstpageleaveDiag = dischargeDiag.get(0).get(Content.diagnoseName);
             String firstpageleaveDiag = dischargeDiag.get(0).get(Content.diagnoseName);
-            String leaveDiag = leaveDiags.get(0).getName();
+            String leaveDiag = leaveDiags.get(0).getHospitalDiagName();
             if (!CatalogueUtil.compareToken(firstpageleaveDiag, leaveDiag)) {
             if (!CatalogueUtil.compareToken(firstpageleaveDiag, leaveDiag)) {
                 status.set("-1");
                 status.set("-1");
             }
             }

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0094.java

@@ -33,6 +33,7 @@ public class THR0094 extends QCCatalogue {
         RedisUtil redisUtil = SpringContextUtil.getBean("redisUtil");
         RedisUtil redisUtil = SpringContextUtil.getBean("redisUtil");
         Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (surgeon == null) {
         if (surgeon == null) {
+            status.set("0");
             return;
             return;
         }
         }
         Map<String, String> doctor = (Map) surgeon.get(sign);
         Map<String, String> doctor = (Map) surgeon.get(sign);

+ 13 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0140.java

@@ -42,14 +42,23 @@ public class THR0140 extends QCCatalogue {
 
 
         StringBuffer message = new StringBuffer();
         StringBuffer message = new StringBuffer();
         //长兴:返回所有医师未签名的记录日期
         //长兴:返回所有医师未签名的记录日期
+        int i = 0;
         for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
         for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
-            if(StringUtil.isBlank(threeLevelWardDoc.getStructureMap().get("记录医师"))){
-                if(threeLevelWardDoc.getStructureMap() != null && threeLevelWardDoc.getStructureMap().get("记录时间") != null){
-                    message.append(threeLevelWardDoc.getStructureMap().get("记录时间")+",");
+            if (StringUtil.isBlank(threeLevelWardDoc.getStructureMap().get("记录医师"))) {
+                if (threeLevelWardDoc.getStructureMap() != null && threeLevelWardDoc.getStructureMap().get("记录时间") != null) {
+                    if (i > 1) {
+                        break;
+                    }
+                    if (message.toString().length() == 0) {
+                        message.append(threeLevelWardDoc.getStructureMap().get("记录时间"));
+                    } else {
+                        message.append(",").append(threeLevelWardDoc.getStructureMap().get("记录时间"));
+                    }
+                    i++;
                 }
                 }
             }
             }
         }
         }
-        info.set(message.toString());
+        info.set(message.append("...").toString());
         //        if (inputInfo.getDifficultCaseDiscussDocs().size() > 0) {
         //        if (inputInfo.getDifficultCaseDiscussDocs().size() > 0) {
         //            processSign(inputInfo, "疑难患者");
         //            processSign(inputInfo, "疑难患者");
         //        }
         //        }