Merge remote-tracking branch 'origin/dev/ez' into dev/ez

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

@@ -111,6 +111,10 @@ public class FirstCourseRecordTran extends TargetTran {
          }
             if(StringUtil.isNotEmpty(retMap.get("病例特点"))) {
                 String specical = retMap.get("病例特点");
+                String flagName = "因“";
+                if (specical.contains(flagName)) {
+                    specical = specical.substring(specical.indexOf(flagName));
+                }
                 String retStr = "";
                 if (specical.contains("“")) {
                     String[] split = specical.split("“");
@@ -132,19 +136,27 @@ public class FirstCourseRecordTran extends TargetTran {
 
          if(text.contains("诊疗计划：")){
             String str = text.substring(text.lastIndexOf("诊疗计划：") + "诊疗计划：".length());
+            String flagName = "";
              if(str.contains("\n")){
                  String[] split = str.split("\n");
                  for (int i = 0; i < split.length; i++) {
                      if(split[i].contains("/") && split[i].length()<=15){
-                         str = str.substring(0,str.lastIndexOf(split[i]));
-                         retMap.put("诊疗计划",str);
+                         flagName = split[i];
                      }else{
                          String date = extractDate(split[i]);
                          if(StringUtil.isNotEmpty(date)){
-                             str = str.substring(0, str.indexOf(date));
-                             retMap.put("诊疗计划",str);
+                             flagName = split[i];
+                         }else{
+                             if(split[i].contains("年") && split[i].contains("月")&& split[i].contains("日")){
+                                 flagName = split[i];
+                             }
                          }
                      }
+                     String plan = retMap.get("诊疗计划");
+                     if(StringUtil.isNotEmpty(flagName) && plan.contains(flagName)){
+                          plan = plan.substring(0, plan.lastIndexOf(flagName));
+                         retMap.put("诊疗计划",plan);
+                     }
                  }
              }
          }
@@ -163,6 +175,10 @@ public class FirstCourseRecordTran extends TargetTran {
                             String[] splits = split[i].split("：");
                             sb.append(splits[0]);
                             flag = false;
+                        }else if(split[i].contains(":")){
+                            String[] splits = split[i].split(":");
+                            sb.append(splits[0]);
+                            flag = false;
                         }
                     }
                 }
@@ -173,8 +189,8 @@ public class FirstCourseRecordTran extends TargetTran {
                 if(flag){
                     String firStr = retMap.get("鉴别诊断");
                     retMap.put("鉴别诊断-西医诊断名称",firStr);
-                    retMap.remove("鉴别诊断");
                 }
+                retMap.remove("鉴别诊断");
             }
         }
     }

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

@@ -48,11 +48,9 @@ public class InformedConsentTran extends TargetTran {
         List<String> titles = CommonAnalysisUtil.sortTitles(
                 Lists.newArrayList("科别","床号","联系地址","具体如下","病情告知","知情选择","医师签名","医生签字"), text);
         CommonAnalysisUtil.cutByTitles(text, titles, 0, sourceMap);
-        if(sourceMap.containsKey("联系地址") || sourceMap.containsKey("医生签字") || sourceMap.containsKey("知情选择")
-                || sourceMap.containsKey("医师签名")){
+        if(sourceMap.containsKey("联系地址") || sourceMap.containsKey("医生签字")|| sourceMap.containsKey("医师签名")){
             sourceMap.remove("联系地址");
             sourceMap.remove("医生签字");
-            sourceMap.remove("知情选择");
             sourceMap.remove("医师签名");
         }
         return sourceMap;
@@ -152,6 +150,22 @@ public class InformedConsentTran extends TargetTran {
                         }
                     }
                 }
+
+                //知情同意内容&&医疗机构意见
+                if (StringUtil.isNotEmpty(retMap.get("知情选择").trim())) {
+                    String choose = retMap.get("知情选择");
+                    if(choose.contains("医生签字")){
+                         choose = choose.substring(0, choose.lastIndexOf("医生签字"));
+                    }
+                    if (StringUtil.isNotEmpty(retMap.get("病情告知").trim())) {
+                        String tell = retMap.get("病情告知");
+                        retMap.put("病情告知",tell+"知情选择:"+choose);
+                    }else{
+                        retMap.put("病情告知",choose);
+                    }
+                    retMap.remove("知情选择");
+                }
+
             }
         }
     }