中医规则

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

@@ -40,9 +40,10 @@ public class FIRC03230 extends QCCatalogue {
         String diagText2 = firstCourseRecordDoc.getStructureMap() != null
                 ? firstCourseRecordDoc.getStructureMap().get("初步诊断")
                 : "";
-        String firstPageDiagText = firstPageRecordDoc.getStructureMap() != null
+        String firstPageDiagText = firstPageRecordDoc == null ? ""
+                : (firstPageRecordDoc.getStructureMap() != null
                 ? firstPageRecordDoc.getStructureMap().get("门急诊诊断")
-                : "";
+                : "");
 
         //先判断是否下了中医诊断，没有则通过 或 判断病案首页门急诊诊断是否下诊断，"-"为空，没有则通过
         if ((StringUtil.isBlank(diagText2) || !diagText2.contains("中医诊断"))
@@ -68,4 +69,4 @@ public class FIRC03230 extends QCCatalogue {
         }
 
     }
-}
+}

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

@@ -40,9 +40,10 @@ public class FIRC03231 extends QCCatalogue {
         String diagText2 = firstCourseRecordDoc.getStructureMap() != null
                 ? firstCourseRecordDoc.getStructureMap().get("初步诊断")
                 : "";
-        String firstPageDiagText = firstPageRecordDoc.getStructureMap() != null
+        String firstPageDiagText = firstPageRecordDoc == null ? ""
+                : (firstPageRecordDoc.getStructureMap() != null
                 ? firstPageRecordDoc.getStructureMap().get("门急诊诊断")
-                : "";
+                : "");
 
         //先判断是否下了中医诊断，没有则通过 或 判断病案首页门急诊诊断是否下诊断，"-"为空，没有则通过
         if ((StringUtil.isBlank(diagText2) || !diagText2.contains("中医诊断"))

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

@@ -47,9 +47,10 @@ public class FIRC03232 extends QCCatalogue {
         String diagText2 = firstCourseRecordDoc.getStructureMap() != null
                 ? firstCourseRecordDoc.getStructureMap().get("初步诊断")
                 : "";
-        String firstPageDiagText = firstPageRecordDoc.getStructureMap() != null
+        String firstPageDiagText = firstPageRecordDoc == null ? ""
+                : (firstPageRecordDoc.getStructureMap() != null
                 ? firstPageRecordDoc.getStructureMap().get("门急诊诊断")
-                : "";
+                : "");
 
         //先判断是否下了中医诊断，没有则通过 或 判断病案首页门急诊诊断是否下诊断，"-"为空，没有则通过
         if ((StringUtil.isBlank(diagText2) || !diagText2.contains("中医诊断"))
@@ -88,4 +89,4 @@ public class FIRC03232 extends QCCatalogue {
         }
 
     }
-}
+}