Merge branch 'dev-shaoyf' into dev

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

@@ -38,7 +38,9 @@ public class BEH0449 extends QCCatalogue {
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
         String chief_text = beHospitalizedDoc.getChiefLabel().getText();
         if (chief_text.contains("检查") || chief_text.contains("术后") || chief_text.contains("药物")
-                || chief_text.contains("发现")) {
+                || chief_text.contains("发现") || chief_text.contains("体检") || chief_text.contains("确诊")
+                || chief_text.contains("复查") || chief_text.contains("诊断")
+        ) {
             status.set("0");
             return;
         } else {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0340.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -21,10 +20,11 @@ public class DEAR0340 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getDeathRecordDoc() != null && inputInfo.getDeathRecordDoc().getStructureMap() != null) {
             Map<String, String> deathRecordStructureMap = inputInfo.getDeathRecordDoc().getStructureMap();
-            if(StringUtils.isBlank(deathRecordStructureMap.get("主诉"))){
-                status.set("-1");
-                return;
-            }
+            // 与任燕青确认，统一只需要判断入院情况，
+            // if(StringUtils.isBlank(deathRecordStructureMap.get("主诉"))){
+            //     status.set("-1");
+            //     return;
+            // }
             if (CatalogueUtil.isEmpty(deathRecordStructureMap.get("入院情况"))) {
                 status.set("-1");
             }

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

@@ -33,13 +33,18 @@ public class FIRC0087 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-        if(firstCourseRecordDoc != null){
+        if (firstCourseRecordDoc != null) {
             DiagLabel differentialDiagLabel = firstCourseRecordDoc.getDifferentialDiagLabel();
             CaseCharacteristicLabel casecharLabel = firstCourseRecordDoc.getCaseCharacteristicLabel();
             DiagLabel initDiagLabel = firstCourseRecordDoc.getInitialDiagLabel();
 
-            if(differentialDiagLabel != null){
-//                List<Diag> diags = differentialDiagLabel.getDiags();
+            if (differentialDiagLabel != null) {
+                Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+                String diffDiagStruct = structureMap.get("鉴别诊断");
+                if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别"))) {
+                    return;
+                }
+                //List<Diag> diags = differentialDiagLabel.getDiags();
                 String diag = initDiagLabel.getDiags().get(0).getHospitalDiagName();
                 String casechar = casecharLabel.getText();
                 String chief = "";
@@ -51,7 +56,7 @@ public class FIRC0087 extends QCCatalogue {
 
                 if (StringUtils.isNotEmpty(differentialDiagLabel.getText())) {
                     if (differentialDiagLabel.getText().contains("诊断明确")
-                        || differentialDiagLabel.getText().contains("无需鉴别")) {
+                            || differentialDiagLabel.getText().contains("无需鉴别")) {
                         if (chief.contains("术后") || chief.contains("孕") || chief.contains("化疗")
                                 || chief.contains("肿瘤") || chief.contains("癌") || chief.contains("确诊")
                                 || chief.contains("外伤") || chief.contains("摔伤")) {
@@ -62,8 +67,7 @@ public class FIRC0087 extends QCCatalogue {
                             status.set("-1");
                         }
                     }
-                }
-                else if (StringUtils.isEmpty(differentialDiagLabel.getText())) {
+                } else if (StringUtils.isEmpty(differentialDiagLabel.getText())) {
                     status.set("-1");
                 }
                 /*

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

@@ -31,6 +31,12 @@ public class THR02880 extends QCCatalogue {
         }
         List<DirectorDoctorWardDoc> directorDocs = inputInfo.getThreeLevelWardDocs().get(0).getDirectorDoctorWardDocs();
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
+        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String diffDiagStruct = structureMap.get("鉴别诊断");
+        if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别"))) {
+            status.set("0");
+            return;
+        }
         String firstCourseDiffDiag = getDiffDiag(firstCourseRecordDoc);
         if (StringUtil.isBlank(firstCourseDiffDiag)) {
             status.set("0");
@@ -75,7 +81,7 @@ public class THR02880 extends QCCatalogue {
             }
         }
 
-        if (firstAttendLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(firstAttendLabel.getDiffDiagText())){
+        if (firstAttendLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(firstAttendLabel.getDiffDiagText())) {
             status.set("0");
         }
     }

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

@@ -30,6 +30,12 @@ public class THR0701 extends QCCatalogue {
         }
         List<AttendingDoctorWardDoc> attendDocs = inputInfo.getThreeLevelWardDocs().get(0).getAttendingDoctorWardDocs();
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
+        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String diffDiagStruct = structureMap.get("鉴别诊断");
+        if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别"))) {
+            status.set("0");
+            return;
+        }
         String firstCourseDiffDiag = getDiffDiag(firstCourseRecordDoc);
         if (StringUtil.isBlank(firstCourseDiffDiag)) {
             status.set("0");