病案首页手术名称和手术记录的名称进行比较

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

@@ -1,14 +1,13 @@
 package com.lantone.qc.kernel.catalogue.firstpagerecord;
-
 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.model.doc.FirstPageRecordDoc;
-import com.lantone.qc.pub.model.doc.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
+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;
 
@@ -23,21 +22,21 @@ public class FIRP0192 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
-        List<OperationDiscussionDoc> operationDiscussionDocs = inputInfo.getOperationDiscussionDocs();
-        if(firstPageRecordDoc != null && operationDiscussionDocs.size()>0 ){
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs != null&& operationDocs.size()>0){
+            OperationDoc operationDoc = operationDocs.get(0);
+            OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
+            Map<String, String> docStructureMap = operationDiscussionDoc.getStructureMap();
             Map<String, Object> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureExtMap();
-            OperationDiscussionDoc operationDiscussionDoc = operationDiscussionDocs.get(0);
-            Map<String, String> structureMap = operationDiscussionDoc.getStructureMap();
-            String opertaion = structureMap.get("手术方式");
+            String opertaion = docStructureMap.get("手术方式");
             List<Map<String, String>> mapList = (List<Map<String, String>>) firstPageRecordDocStructureMap.get(Content.operative_information);
             if(mapList != null && mapList.size()>0){
                 Map<String, String> op = mapList.get(0);
                 String oName = op.get(Content.operative_name);
-                    if(StringUtils.isNotEmpty(opertaion) && !opertaion.equals(oName)){
-                        status = "-1";
+                if(StringUtils.isNotEmpty(opertaion) && !opertaion.equals(oName)){
+                    status = "-1";
                 }
             }
-
         }
 
     }

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

@@ -1,15 +1,17 @@
 package com.lantone.qc.kernel.catalogue.firstpagerecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 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.model.doc.FirstPageRecordDoc;
-import com.lantone.qc.pub.model.doc.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDoc;
+import com.lantone.qc.pub.util.ListUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -24,23 +26,29 @@ public class FIRP0193 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
-        List<OperationDiscussionDoc> operationDiscussionDocs = inputInfo.getOperationDiscussionDocs();
-        if(firstPageRecordDoc != null && operationDiscussionDocs.size()>0 ){
-            Map<String, Object> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureExtMap();
-            OperationDiscussionDoc operationDiscussionDoc = operationDiscussionDocs.get(0);
-            Map<String, String> structureMap = operationDiscussionDoc.getStructureMap();
-            String opertaion = structureMap.get("手术方式");
-            List<Map<String, String>> mapList = (List<Map<String, String>>) firstPageRecordDocStructureMap.get(Content.operative_information);
-            if(mapList != null && mapList.size()>0){
-                for (Map<String, String> op :mapList) {
-                    String oName = op.get(Content.operative_name);
-                    if(StringUtils.isNotEmpty(opertaion) && !opertaion.contains(oName)){
-                        status = "-1";
-                        break;
-                    }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        List<String> operations = new ArrayList<>();
+        List<String> operations_first = new ArrayList<>();
+        if(operationDocs != null&& operationDocs.size()>0){
+            for (OperationDoc opd:operationDocs) {
+                operations.add(opd.getOperationDiscussionDoc().getStructureMap().get("手术方式"));
+            }
+        }
+        Map<String, Object> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureExtMap();
+        List<Map<String, String>> mapList = (List<Map<String, String>>) firstPageRecordDocStructureMap.get(Content.operative_information);
+        if(mapList != null && mapList.size()>0){
+            for (Map<String, String> ds:mapList) {
+                String oName = ds.get(Content.operative_name);
+                if(StringUtils.isNotEmpty(oName)){
+                    operations_first.add(oName);
                 }
             }
-
+        }
+        boolean equals = ListUtil.equals(operations, operations_first);
+        if(equals){
+            status = "0";
+        }else {
+            status = "-1";
         }
 
     }