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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0569.java

@@ -40,7 +40,8 @@ public class CLI0569 extends QCCatalogue {
                 if (cliBStructureMap.containsKey("输注种类、血型、数量")) {
                     String bloodType = cliBStructureMap.get("输注种类、血型、数量");
                     if (StringUtils.isNotEmpty(bloodType) &&
-                            (bloodType.contains("白蛋白") || bloodType.contains("凝血酶原复合物"))) {
+                            (bloodType.contains("白蛋白") || bloodType.contains("凝血酶原复合物")
+                                    || bloodType.contains("血浆"))) {
                         matchSum++;
                         continue;
                     }

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

@@ -41,10 +41,14 @@ public class FIRC0087 extends QCCatalogue {
             if (differentialDiagLabel != null) {
                 Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
                 String diffDiagStruct = structureMap.get("鉴别诊断");
-                if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别")
-                        || diffDiagStruct.contains("明确诊断"))) {
+                if(StringUtils.isNotEmpty(diffDiagStruct)){
                     return;
                 }
+                /*if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别")
+                        || diffDiagStruct.contains("明确诊断"))) {
+                    return;
+                }*/
+
                 //List<Diag> diags = differentialDiagLabel.getDiags();
                 String diag = initDiagLabel.getDiags().get(0).getHospitalDiagName();
                 String casechar = casecharLabel.getText();

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

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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA02901.java

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,17 +33,19 @@ public class LEA02901 extends QCCatalogue {
         if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
             Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
             String dischargeOrder = structureMap.get("出院医嘱");
-            //跟医学部任燕青确认过， 去除括号里的东西
-            dischargeOrder = RegularUtil.ClearBracket(dischargeOrder);
-            if (StringUtil.isNotBlank(dischargeOrder)) {
-                List<String> words = Lists.newArrayList("qd","bid","tid","qid","qh","q2h","q4h","q6h","q8h",
-                        "qn","q3w","qod","biw","qw","prn","sos","ad","lib","st","stat","hs","am","po","ID","IH","IM",
-                        "IV","OD","OL","OS","OU","ivgtt","Q12H","QN","ONCE");
-                for (String word : words) {
-                    if (dischargeOrder.contains(word.toUpperCase()) || dischargeOrder.contains(word.toLowerCase())) {
-                        status.set("-1");
-                        info.set("出院医嘱用法用量不规范");
-                        return;
+            if(StringUtils.isNotEmpty(dischargeOrder)){
+                //跟医学部任燕青确认过， 去除括号里的东西
+                dischargeOrder = RegularUtil.ClearBracket(dischargeOrder);
+                if (StringUtil.isNotBlank(dischargeOrder)) {
+                    List<String> words = Lists.newArrayList("qd","bid","tid","qid","qh","q2h","q4h","q6h","q8h",
+                            "qn","q3w","qod","biw","qw","prn","sos","ad","lib","st","stat","hs","am","po","ID","IH","IM",
+                            "IV","OD","OL","OS","OU","ivgtt","Q12H","QN","ONCE");
+                    for (String word : words) {
+                        if (dischargeOrder.contains(word.toUpperCase()) || dischargeOrder.contains(word.toLowerCase())) {
+                            status.set("-1");
+                            info.set("出院医嘱用法用量不规范");
+                            return;
+                        }
                     }
                 }
             }