其他知情同意书

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

@@ -200,20 +200,14 @@ public class InformedConsentTran extends TargetTran {
             }
 
                 //知情同意内容&&医疗机构意见
+            if (StringUtil.isNotEmpty(retMap.get("病情告知")) && StringUtil.isNotEmpty(retMap.get("病情告知").trim())) {
+                String tell = retMap.get("病情告知");
+                       tell = repalce(tell);
+                retMap.put("病情告知",tell);
+            }
                 if (StringUtil.isNotEmpty(retMap.get("知情选择"))&& StringUtil.isNotEmpty(retMap.get("知情选择").trim())) {
                     String choose = retMap.get("知情选择");
-                    if(choose.contains("医生签字")){
-                         choose = choose.substring(0, choose.lastIndexOf("医生签字"));
-                    }
-                    if(choose.contains("医生签名")){
-                        choose = choose.substring(0, choose.lastIndexOf("医生签名"));
-                    }
-                    if(choose.contains("医师签字")){
-                        choose = choose.substring(0, choose.lastIndexOf("医师签字"));
-                    }
-                    if(choose.contains("医师签字")){
-                        choose = choose.substring(0, choose.lastIndexOf("医师签字"));
-                    }
+                    choose = repalce(choose);
                     retMap.put("知情选择",choose);
                     if (StringUtil.isNotEmpty(retMap.get("病情告知")) && StringUtil.isNotEmpty(retMap.get("病情告知").trim())) {
                         String tell = retMap.get("病情告知");
@@ -425,4 +419,19 @@ public class InformedConsentTran extends TargetTran {
         }
         return null;
     }
+    public static String repalce(String choose) {
+       if(choose.contains("医生签字")){
+        choose = choose.substring(0, choose.lastIndexOf("医生签字"));
+    }
+                    if(choose.contains("医生签名")){
+        choose = choose.substring(0, choose.lastIndexOf("医生签名"));
+    }
+                    if(choose.contains("医师签字")){
+        choose = choose.substring(0, choose.lastIndexOf("医师签字"));
+    }
+                    if(choose.contains("医师签名")){
+        choose = choose.substring(0, choose.lastIndexOf("医师签名"));
+         }
+        return choose;
+    }
 }