规则

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

@@ -136,6 +136,11 @@ public class CLI0304 extends QCCatalogue {
                 .filter(i -> StringUtil.isNotBlank(i.getStructureMap().get("医嘱项目名称"))
                         && (!i.getStructureMap().get("医嘱项目名称").contains("预约"))
                         && RegexUtil.getRegexRes(i.getStructureMap().get("医嘱项目名称"), regex5))
+                .filter(i -> StringUtil.isBlank(i.getStructureMap().get("医嘱处方类型"))
+                        ||(StringUtil.isNotBlank(i.getStructureMap().get("医嘱处方类型"))
+                        && !i.getStructureMap().get("医嘱处方类型").equals("化验")
+                        && !i.getStructureMap().get("医嘱处方类型").equals("检验")
+                        && !i.getStructureMap().get("医嘱处方类型").equals("检查")))
                 .collect(Collectors.toList());
         if (ListUtil.isNotEmpty(clinicalBloodDAList)) {
             if (ListUtil.isNotEmpty(filterDAList)) {

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

@@ -110,9 +110,10 @@ public class FIRP0178 extends QCCatalogue {
     private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag) {
         List<String> firstpageDiag = new ArrayList<>();
         for (int i = 0; i < dischargeDiag.size(); i++) {
-            if ("主要诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
+            //病案首页不区分主诊断和其他诊断，出院小结仍然区分
+            /*if ("主要诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
                 continue;
-            }
+            }*/
             String diagnoseName = dischargeDiag.get(i).get(Content.diagnoseName);
             if (StringUtil.isBlank(diagnoseName) || "-".equals(diagnoseName)) { // 诊断名称为空不算
                 continue;