恩泽：手术知情同意书解析更改

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

@@ -39,6 +39,9 @@ public class OperationInformedConsentDocTran extends TargetTran {
             disDate(sourceMap, "患者（代理人）签名", "签名时间");
             disDate(sourceMap, "患者及家属要求手术治疗，并签字为证", "七、医师声明");
             disDate(sourceMap, "主刀医师签名", "八、患方意见");
+            disDate(sourceMap, "主刀医师签名", "签名时间");
+
+            CommonAnalysisUtil.removeKey(sourceMap, "二、您的主刀医师是", "四、医师会用通俗易懂的语言向您解释");
         }
         return sourceMap;
     }
@@ -48,7 +51,7 @@ public class OperationInformedConsentDocTran extends TargetTran {
         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],""));
+            sourceMap.put(args[0]+args[1],sourceMap_.get(args[0]).substring(index).replace(args[1],"").replaceAll("[:：]",""));
         }
     }
 
@@ -65,7 +68,10 @@ public class OperationInformedConsentDocTran extends TargetTran {
             "书写者签名=经治医师签名",
             "书写者签名签名时间=医师签名日期时间",
             "患者（代理人）签名签名时间=患者/法定代理人签名日期时间",
+            "七、医师声明=医疗机构意见",
             "患者及家属要求手术治疗，并签字为证七、医师声明=医疗机构意见",
-            "主刀医师签名八、患方意见=患者/法定代理人意见"
+            "主刀医师签名八、患方意见=患者/法定代理人意见",
+            "八、患方意见=患者/法定代理人意见",
+            "主刀医师签名签名时间=医师签名日期时间"
     );
 }

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

@@ -257,6 +257,15 @@ public class CommonAnalysisUtil {
         }
     }
 
+
+    public static void removeKey(Map<String, String> sourceMap, String... args) {
+        for (String dateStr : args) {
+            if (sourceMap.containsKey(dateStr)) {
+                sourceMap.remove(dateStr);
+            }
+        }
+    }
+
     public static void mapKeyContrastCommon(Map sourceMap, List<String> keyContrasts, Map<String, String> retMap) {
         Map<String, String> sourceMap_ = MapUtil.copyMap(sourceMap);
         String[] arry = null;