Browse Source

术后解析修改

rengb 4 years ago
parent
commit
40b49f4248

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -41,14 +41,14 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             return retList;
             return retList;
         }
         }
 
 
-        //Map<String, OperationDiscussionDoc> operationDiscussionDocMap = getOperationDiscussionDocMap((List) contentMap.get("术后首次病程及谈话记录"));
+        Map<String, OperationDiscussionDoc> operationDiscussionDocMap = getOperationDiscussionDocMap((List) contentMap.get("术后首次病程及谈话记录"));
         //Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap((List) contentMap.get("手术记录"));
         //Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap((List) contentMap.get("手术记录"));
         Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap((List) contentMap.get("术前讨论、术前小结"));
         Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap((List) contentMap.get("术前讨论、术前小结"));
         //Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap((List) contentMap.get("手术知情同意书"));
         //Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap((List) contentMap.get("手术知情同意书"));
         //Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap((List) contentMap.get("手术安全核查表"));
         //Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap((List) contentMap.get("手术安全核查表"));
 
 
         Set<String> operationNameSet = Sets.newHashSet();
         Set<String> operationNameSet = Sets.newHashSet();
-        //operationNameSet.addAll(operationDiscussionDocMap.keySet());
+        operationNameSet.addAll(operationDiscussionDocMap.keySet());
         //operationNameSet.addAll(operationRecordDocMap.keySet());
         //operationNameSet.addAll(operationRecordDocMap.keySet());
         operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
         operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
         //operationNameSet.addAll(operationInformedConsentDocMap.keySet());
         //operationNameSet.addAll(operationInformedConsentDocMap.keySet());
@@ -57,7 +57,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         operationNameSet.forEach(operationName -> {
         operationNameSet.forEach(operationName -> {
             OperationDoc operationDoc = new OperationDoc();
             OperationDoc operationDoc = new OperationDoc();
             operationDoc.setOperationName(operationName);
             operationDoc.setOperationName(operationName);
-            //operationDoc.setOperationDiscussionDoc(operationDiscussionDocMap.get(operationName));
+            operationDoc.setOperationDiscussionDoc(operationDiscussionDocMap.get(operationName));
             //operationDoc.setOperationRecordDoc(operationRecordDocMap.get(operationName));
             //operationDoc.setOperationRecordDoc(operationRecordDocMap.get(operationName));
             operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDocMap.get(operationName));
             operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDocMap.get(operationName));
             //operationDoc.setOperationInformedConsentDoc(operationInformedConsentDocMap.get(operationName));
             //operationDoc.setOperationInformedConsentDoc(operationInformedConsentDocMap.get(operationName));