恩泽：crf模型手术知情同意书映射

structure-center/src/main/java/com/lantone/structure/facade/StructureFacade.java

@@ -74,9 +74,9 @@ public class StructureFacade {
             case "病危通知书":
                 targetTran = new CriticallyIllNoticeDocTran();
                 break;
-//            case "手术知情同意书":
-//                targetTran = new OperationInformedConsentDocTran();
-//                break;
+            case "手术知情同意书":
+                targetTran = new OperationInformedConsentDocTran();
+                break;
             case "会诊记录":
                 targetTran = new ConsultationTran();
                 break;

structure-center/src/main/java/com/lantone/structure/facade/tran/OperationInformedConsentDocTran.java

@@ -3,6 +3,7 @@ package com.lantone.structure.facade.tran;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.structure.facade.tran.util.CommonAnalysisUtil;
+import com.lantone.structure.util.MapUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
@@ -42,11 +43,12 @@ public class OperationInformedConsentDocTran extends TargetTran {
         return sourceMap;
     }
 
-    private void disDate(Map<String, String> sourceMap, String... args) {
-        if(sourceMap.containsKey(args[0]) && sourceMap.get(args[0]).contains(args[1])){
-            int index = sourceMap.get(args[0]).indexOf(args[1]);
-            sourceMap.put(args[0],sourceMap.get(args[0]).substring(0,index));
-            sourceMap.put(args[0]+args[1],sourceMap.get(args[0]).substring(index).replace(args[1],""));
+    private void disDate(Map sourceMap, String... args) {
+        Map<String, String> sourceMap_ = MapUtil.copyMap(sourceMap);
+        if(sourceMap.containsKey(args[0]) && sourceMap_.get(args[0]).contains(args[1])){
+            int index = sourceMap_.get(args[0]).indexOf(args[1]);
+            sourceMap.put(args[0],sourceMap_.get(args[0]).substring(0,index));
+            sourceMap.put(args[0]+args[1],sourceMap_.get(args[0]).substring(index).replace(args[1],""));
         }
     }
 

structure-center/src/main/java/com/lantone/structure/facade/tran/util/CommonAnalysisUtil.java

@@ -270,7 +270,7 @@ public class CommonAnalysisUtil {
             } else {
                 targetKey = arry[1];
             }
-            if (StringUtil.isNotBlank(sourceMap_.get(sourceKey))
+            if (sourceMap_.get(sourceKey) != null
                     && (!retMap.containsKey(targetKey) || StringUtil.isBlank(retMap.get(targetKey)))) {
                 retMap.put(targetKey, sourceMap_.get(sourceKey));
             }