Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0009.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Component
 public class BEH0009 extends QCCatalogue {
     private List<String> containList = Arrays.asList("检查", "术后", "药物", "发现", "误服", "确诊", "经", "异常", "诊断"
-            , "示", "超", "伤", "术");
+            , "示", "超", "伤", "术", "复查", "体检", "血透", "血液透析");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.java

@@ -36,6 +36,9 @@ public class BEH0053 extends QCCatalogue {
         }
         //硬规则 匹配未婚
         String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
+        if(StringUtil.isBlank(marry)){
+            marry = beHospitalizedDoc.getStructureMap().get("婚姻状况");
+        }
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
         if (maritalLabel == null || StringUtil.isBlank(maritalLabel.getText())) {
             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0088.java

@@ -29,7 +29,7 @@ public class FIRC0088 extends QCCatalogue {
         Map<String, String> firstCourseStructureMap = firstCourseRecordDoc.getStructureMap();
         String diffDiag = firstCourseStructureMap.get("鉴别诊断");
         if (StringUtil.isBlank(diffDiag) || diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别")
-                || diffDiag.contains("明确诊断")) {
+                || diffDiag.contains("明确诊断") || diffDiag.contains("诊断基本明确")) {
             return;
         }
         DiagLabel differentialDiagLabel = firstCourseRecordDoc.getDifferentialDiagLabel();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0126.java

@@ -36,8 +36,8 @@ public class THR0126 extends QCCatalogue {
         if (inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null
                 && inputInfo.getThreeLevelWardDocs().size() > 0) {
             Map<String, String> getLeaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String admisTime = getLeaveHospitalStructureMap.get(Content.admisTime);
-            String dischargeTime = getLeaveHospitalStructureMap.get(Content.dischargeTime);
+            String admisTime = getLeaveHospitalStructureMap.get("入院日期");
+            String dischargeTime = getLeaveHospitalStructureMap.get("出院日期");
             if (CatalogueUtil.isEmpty(admisTime)) {
                 status.set("0");
                 return;
@@ -101,7 +101,7 @@ public class THR0126 extends QCCatalogue {
 
     private String getFirstCourseProfessor(FirstCourseRecordDoc firstCourseRecordDoc) {
         String professor = "";
-        String doctorSign = firstCourseRecordDoc.getStructureMap().get("记录医师");
+        String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");
         if (StringUtil.isBlank(doctorSign)) {
             return professor;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0136.java

@@ -30,7 +30,8 @@ public class THR0136 extends QCCatalogue {
         if (firstCourseRecordDoc != null) {
             Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
             String diffDiag = structureMap.get("鉴别诊断");
-            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别"))) {
+            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别") ||
+                    diffDiag.contains("诊断基本明确"))) {
                 status.set("0");
                 return;
             }
@@ -58,7 +59,8 @@ public class THR0136 extends QCCatalogue {
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
                     || conditionRecord.contains("诊断明确")
-                    || conditionRecord.contains("无需鉴别")) {
+                    || conditionRecord.contains("无需鉴别")
+                    || conditionRecord.contains("诊断基本明确")) {
                 status.set("0");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0140.java

@@ -34,25 +34,26 @@ public class THR0140 extends QCCatalogue {
         }
         List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs
                 .stream()
-                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医师")))
+                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录医生")))
                 .collect(Collectors.toList());
         if (recordDoctorList.size() == 0) {
             status.set("0");
+            return;
         }
 
         StringBuffer message = new StringBuffer();
         //长兴：返回所有医师未签名的记录日期
         int i = 0;
         for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
-            if (StringUtil.isBlank(threeLevelWardDoc.getStructureMap().get("记录医师"))) {
-                if (threeLevelWardDoc.getStructureMap() != null && threeLevelWardDoc.getStructureMap().get("记录时间") != null) {
+            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("记录时间"));
+                        message.append(threeLevelWardDoc.getStructureMap().get("查房日期"));
                     } else {
-                        message.append(",").append(threeLevelWardDoc.getStructureMap().get("记录时间"));
+                        message.append(",").append(threeLevelWardDoc.getStructureMap().get("查房日期"));
                     }
                     i++;
                 }