zhoutg преди 5 години
родител
ревизия
35e48d787c

+ 14 - 1
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -178,7 +178,20 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return preoperativeDiscussionDoc;
     }
 
-    private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList();
+    private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
+            "讨论时间=讨论时间",
+            "讨论方式=讨论方式",
+            "参加人员及职称=参加人员",
+            "简要病情=简要病情",
+            "主刀医师=主刀医师签名",
+            "主刀医师签字时间=主刀医师签字时间",
+            "手术指征=手术指征",
+            "麻醉方式=麻醉方式",
+            "术前准备=术前准备内容",
+            "注意事项=术前术后注意事项",
+            "术中、术后防范措施=可能意外和防范措施",
+            "拟施手术名称和方式=拟行术式"
+    );
 
     /**********************************************手术知情同意书****************************************************/
     private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<String> contents) {

+ 16 - 9
trans/src/main/java/com/lantone/qc/trans/taizhou/util/TzXmlUtil.java

@@ -62,14 +62,16 @@ public class TzXmlUtil {
         Map<String, Object> res = getReplace(xml);
         String contentReplace = (String)res.get("content");
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(contentReplace);
-        Map<String, String> map = (Map)res.get("replaceMap");
-
-        for (String key : sourceMap.keySet()) {
-            String value = sourceMap.get(key);
-            if (StringUtil.isNotBlank(value)) {
-                for (String key2 : map.keySet()) {
-                    value = value.replaceAll(key2, map.get(key2));
-                    sourceMap.put(key, value);
+        Boolean replace = (Boolean)res.get("repFlag"); // 获取是否要替换的标识
+        if (replace) {
+            Map<String, String> map = (Map) res.get("replaceMap");
+            for (String key : sourceMap.keySet()) {
+                String value = sourceMap.get(key);
+                if (StringUtil.isNotBlank(value)) {
+                    for (String key2 : map.keySet()) {
+                        value = value.replaceAll(key2, map.get(key2));
+                        sourceMap.put(key, value);
+                    }
                 }
             }
         }
@@ -87,7 +89,6 @@ public class TzXmlUtil {
         List<String> cutWord = new ArrayList<>();
         List<String> res1 = new ArrayList<>(); // 包含/的标签</name>
         List<String> res2 = new ArrayList<>();  // 不包含/的标签<name>
-        List<String> convertEle = new ArrayList<>();
         Map<String, String> replaceMap = new HashMap<>();
 
         String pattern = "<.*?>";
@@ -122,6 +123,12 @@ public class TzXmlUtil {
         }
         res.put("content", content);
         res.put("replaceMap", replaceMap);
+        // 添加是否有替换的标识
+        if (replaceMap.size() > 0) {
+            res.put("repFlag", true);
+        } else {
+            res.put("repFlag", false);
+        }
         return res;
     }