优化出院诊断未填写

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0178.java

@@ -43,6 +43,9 @@ public class FIRP0178 extends QCCatalogue {
             }
             /* 病案首页出院小结诊断 除去主诊断*/
             List<String> firstpageLeaveDiags = getFirstPageDiag(dischargeDiag);
+            if (ListUtil.isEmpty(firstpageLeaveDiags)) {
+                return ;
+            }
 
             DiagLabel leaveDiagLabel = inputInfo.getLeaveHospitalDoc().getLeaveDiagLabel();
             if (leaveDiagLabel == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0226.java

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -24,9 +25,16 @@ public class FIRP0226 extends QCCatalogue {
             Object dischargeDiagObj = structureExtMap.get(Content.dischargeDiag);
             if (dischargeDiagObj != null) {
                 List<Map<String, String>> dischargeDiagList = (List) dischargeDiagObj;
-                if (dischargeDiagList.size() == 0) {
+                if (ListUtil.isEmpty(dischargeDiagList)) {
                     status.set("-1");
+                    return ;
                 }
+                for (Map<String, String> map : dischargeDiagList) {
+                    if (map != null && !"门诊诊断".equals(map.get("诊断类别")) && !"-".equals(map.get("诊断名称"))) {
+                        return ;
+                    }
+                }
+                status.set("-1");
             }
         }
     }