修改

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

@@ -41,9 +41,9 @@ public class InformedConsentTran extends TargetTran {
             "床号=病房号",
             "床号=病床号",
             "病情告知=知情同意内容",
-            "病情告知=医疗机构意见",
-            "具体如下=知情同意内容",
-            "具体如下=医疗机构意见"
+            "知情选择=医疗机构意见",
+            "具体如下=知情同意内容"
+           // "具体如下=医疗机构意见"
     );
     private Map<String, String> cutWord(String text) {
         Map<String, String> sourceMap = Maps.newHashMap();
@@ -205,13 +205,23 @@ public class InformedConsentTran extends TargetTran {
                     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("医师签字"));
+                    }
+                    retMap.put("知情选择",choose);
                     if (StringUtil.isNotEmpty(retMap.get("病情告知")) && StringUtil.isNotEmpty(retMap.get("病情告知").trim())) {
                         String tell = retMap.get("病情告知");
-                        retMap.put("病情告知",tell+"  知情选择:"+choose);
-                    }else{
-                        retMap.put("病情告知",choose);
+                        retMap.put("病情告知",tell+"  知情选择: "+choose);
                     }
-                    retMap.remove("知情选择");
+                    /*else{
+                        retMap.put("病情告知",choose);
+                    }*/
                 }
 
                 if (StringUtil.isNotEmpty(retMap.get("具体如下"))&& StringUtil.isNotEmpty(retMap.get("具体如下").trim())) {
@@ -231,6 +241,7 @@ public class InformedConsentTran extends TargetTran {
                     }
                     if(StringUtil.isNotEmpty(choose)){
                         retMap.put("病情告知",tell+"  患者知情选择:"+choose);
+                        retMap.put("医疗机构意见", choose);
                     }
                     else{
                         retMap.put("病情告知",tell);
@@ -267,6 +278,52 @@ public class InformedConsentTran extends TargetTran {
                 }
             }
 
+            //输血血液制品治疗知情同意书
+            if(text.contains("授权委托人意见:")){
+                String advice = "";
+                if (text.contains("授权委托人意见:")) {
+                    advice = text.substring(text.indexOf("授权委托人意见:")+"授权委托人意见:".length());
+                }
+                String replaceName = "患方签名";
+                if (advice.contains("患者签名")) {
+                    replaceName = "患者签名";
+                }
+                if (advice.contains(replaceName)) {
+                    advice = advice.split(replaceName)[0];
+                }
+                if(StringUtil.isNotEmpty(advice)){
+                    retMap.put("患者/法定代理人意见",advice);
+                }
+            }
+             String flagName = "医护人员陈述：";
+            if(text.contains("医护人员陈述:")){
+                flagName = "医护人员陈述:";
+            }
+            if(text.contains("医生陈述")){
+                flagName = "医生陈述";
+            }
+            if(text.contains("医生陈述:")){
+                flagName = "医生陈述:";
+            }
+            if(text.contains("医生陈述：")){
+                flagName = "医生陈述：";
+            }
+            if(text.contains(flagName)){
+                String advice = "";
+                if (text.contains(flagName)) {
+                    advice = text.substring(text.indexOf(flagName)+flagName.length());
+                }
+                String replaceName = "医生签名";
+                if (advice.contains(replaceName)) {
+                    advice = advice.split(replaceName)[0];
+                }
+                if(StringUtil.isNotEmpty(advice)){
+                    retMap.put("医疗机构意见",advice);
+                    retMap.remove("具体如下");
+                    retMap.remove("知情选择");
+                }
+            }
+
             //特殊医用材料使用知情同意书
             if(text.contains("材料内容")){
                 String record = "";