手术编码未填写

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

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

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,9 +26,11 @@ public class FIRP02844 extends QCCatalogue {
             return;
         }
         if (inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+            long count = operationDocs.stream().filter(x -> x.getOperationRecordDoc() != null).count();
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             JSONArray out_diag = (JSONArray)firstpageStructureMap.get("手术信息");
-            if (out_diag.size() > 0) {
+            if (out_diag != null && out_diag.size() > 0) {
                 for (int i=0;i<out_diag.size();i++) {
                     JSONObject jsonObject = out_diag.getJSONObject(i);
                     String diag_code = (String)jsonObject.get("手术编码");