Merge branch 'beilun/dev-fqw' into beilun/dev

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuBeHospitalizedDocTrans.java

@@ -84,51 +84,28 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                 sourceMap.put("孕产次", value);
             }
             //入院记录下方的记录者签名和时间
-            if(sourceMap.containsKey("修正诊断")){
-                String value=sourceMap.get("修正诊断").replaceAll("医师签名","").
-                        replaceAll(":","").
-                        replaceAll("日    期","").
-                        replaceAll("■","").
-                        replaceAll("补充诊断","").
-                        replaceAll("修正诊断","").
-                        replaceAll("\"","").
-                        replaceAll("：","").
-                        replaceAll("日期","").
-                        replaceAll("医生签名","").
-                        replaceAll("签名时间","");
-                sourceMap.put("修正诊断",value);
-            }
-            if(sourceMap.containsKey("诊断和诊断修正")){
-                String value=sourceMap.get("诊断和诊断修正").replaceAll("医师签名","").
-                        replaceAll(":","").
-                        replaceAll("日    期","").
-                        replaceAll("■","").
-                        replaceAll("补充诊断","").
-                        replaceAll("修正诊断","").
-                        replaceAll("\"","").
-                        replaceAll("：","").
-                        replaceAll("日期","").
-                        replaceAll("医生签名","").
-                        replaceAll("签名时间","");
-                sourceMap.put("修正诊断",value);
-            }
-            if(sourceMap.containsKey("补充诊断")){
-                String value=sourceMap.get("补充诊断").replaceAll("医师签名","").
-                        replaceAll(":","").
-                        replaceAll("日    期","").
-                        replaceAll("■","").
-                        replaceAll("补充诊断","").
-                        replaceAll("修正诊断","").
-                        replaceAll("\"","").
-                        replaceAll("：","").
-                        replaceAll("日期","").
-                        replaceAll("医生签名","").
-                        replaceAll("签名时间","");
-                sourceMap.put("补充诊断",value);
+            List<String> diagnosetitles = Lists.newArrayList("修正诊断",
+                    "诊断和诊断修正","补充诊断");
+            for (String diagnose: diagnosetitles) {
+                if(sourceMap.containsKey(diagnose)){
+                    String value=sourceMap.get(diagnose).replaceAll("医师签名","").
+                            replaceAll(":","").
+                            replaceAll("日    期","").
+                            replaceAll("■","").
+                            replaceAll("补充诊断","").
+                            replaceAll("修正诊断","").
+                            replaceAll("\"","").
+                            replaceAll("：","").
+                            replaceAll("日期","").
+                            replaceAll("医生签名","").
+                            replaceAll("签名时间","");
+                    sourceMap.put(diagnose,value);
+                }
             }
+
             if(sourceMap.containsKey("初步诊断医师签名")){
                 String value=sourceMap.get("初步诊断").replaceAll("日期","").
-                        replaceAll(":","");
+                        replaceAll(":","").replaceAll("医师签名","");
                 sourceMap.put("初步诊断",value);
             }
             //产科入院记录个人史处理

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuConsultationDocTrans.java

@@ -111,7 +111,8 @@ public class YiWuConsultationDocTrans extends ModelDocTrans {
             "事件日期=记录时间",
             "医生=记录医师",
             "会诊执行情况=会诊情况",
-            "记录医师签名=记录医生"
+            "记录医师签名=记录医生",
+            "记录医师=记录医生"
     );