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

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/yiwu/QiYuanXmlUtil.java

@@ -36,12 +36,12 @@ public class QiYuanXmlUtil {
                     });
                 });
             });
-//            findElement(root,"XInputField").forEach(fieldElement ->{
-//                String tablePreTxt = getElementPreVal(fieldElement);
-//                findElement(fieldElement.element("XElements"),"XInputField").forEach(element -> {
-//                    xInputField(map,element,tablePreTxt);
-//                });
-//            });
+            findElement(root,"XInputField").forEach(fieldElement ->{
+                String tablePreTxt = getElementPreVal(fieldElement);
+                findElement(fieldElement.element("XElements"),"XInputField").forEach(element -> {
+                    xInputField(map,element,tablePreTxt);
+                });
+            });
             Element bodyTextElement = (Element) doc.selectSingleNode("//XTextDocument/BodyText");
             String bodyText = bodyTextElement.getText();
             map.put("原始文本", bodyText);

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanCriticallyIllNoticeDocTrans.java

@@ -50,6 +50,10 @@ public class QiYuanCriticallyIllNoticeDocTrans extends ModelDocTrans {
         return criticallyIllNoticeDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList();
+    private List<String> keyContrasts = Lists.newArrayList(
+            "病危（重）通知内容=通知内容",
+            "医师签名=告知医师签名"
+    );
+
 
 }

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanDeathCaseDiscussDocTrans.java

@@ -56,7 +56,12 @@ public class QiYuanDeathCaseDiscussDocTrans extends ModelDocTrans {
             "病历日期=记录时间",
             "讨论小结=结论",
             "入院诊断2=入院诊断",
-            "死亡讨论记录=讨论内容"
+            "死亡讨论记录=讨论内容",
+            "主持人姓名=主持人",
+            "参加讨论人员名单=参加人员",
+            "讨论日期=讨论时间",
+            "记录医师签名=记录医师",
+            "病情摘要=病史简介"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanDifficultCaseDiscussDocTrans.java

@@ -37,7 +37,7 @@ public class QiYuanDifficultCaseDiscussDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = QiYuanXmlUtil.xmlToMap(content);
-            List<String> titles =Lists.newArrayList("记录人","主持人");
+            List<String> titles =Lists.newArrayList("记录人","讨论时间","地点","讨论地点","主持人","病人姓名","性别");
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
@@ -68,6 +68,10 @@ public class QiYuanDifficultCaseDiscussDocTrans extends ModelDocTrans {
             "当前科室=科别",
             "主持人姓名=主持人姓名及专业技术职务",
             "参加讨论人员名单=参加人员的姓名及专业技术职务",
+            "参加讨论者=参加人员的姓名及专业技术职务",
+            "讨论意见=讨论发言",
+            "病情摘要=汇报病史",
+            "病程时间=讨论日期",
             "讨论内容=具体讨论意见",
             "讨论时间=讨论日期"
     );

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanRescueDocTrans.java

@@ -75,7 +75,8 @@ public class QiYuanRescueDocTrans extends ModelDocTrans {
             "抢救记录=简要病情",
             "医师签名=记录医生",
             "抢救实施的时间及措施=抢救措施",
-            "病程内容=抢救措施"
+            "病程内容=抢救措施",
+            "病程时间=病历日期"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanStagesSummaryDocTrans.java

@@ -41,9 +41,8 @@ public class QiYuanStagesSummaryDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-            List<String> titles = Lists.newArrayList("入院时情况", "入院诊断", "辅助检查",
-                    "诊治经过", "目前情况", "目前诊断", "进一步诊疗方案",
-                    "记录医师");
+            List<String> titles = Lists.newArrayList("入院时情况","入院情况", "入院诊断", "辅助检查","诊疗经过",
+                    "诊治经过", "目前情况", "目前诊断", "进一步诊疗方案","诊疗计划", "记录医师");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -51,6 +50,9 @@ public class QiYuanStagesSummaryDocTrans extends ModelDocTrans {
             if(structureMap.containsKey("病程内容")){
                 structureMap.put("病程内容",structureMap.get("病程内容").split("入院时情况")[0]);
             }
+            if(structureMap.containsKey("病历内容")){
+                structureMap.put("主诉",structureMap.get("病历内容").split("入院情况")[0]);
+            }
         }
 
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();
@@ -70,7 +72,8 @@ public class QiYuanStagesSummaryDocTrans extends ModelDocTrans {
             "今后治疗方案=诊疗计划",
             "入院时情况=入院情况",
             "记录医师=记录医生",
-            "病程时间=记录时间"
+            "病程时间=记录时间",
+            "诊疗经过=诊治经过"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/hangzhoudiqi/QiYuanTransferRecordDocTrans.java

@@ -151,7 +151,7 @@ public class QiYuanTransferRecordDocTrans extends ModelDocTrans {
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setText(content);
         transferIntoDoc.setStructureMap(structureMap);
-        transferIntoDoc.setPageData((Map) sourceMap);
+        transferIntoDoc.setPageData((Map) structureMap);
 
         return transferIntoDoc;
     }
@@ -162,7 +162,10 @@ public class QiYuanTransferRecordDocTrans extends ModelDocTrans {
             "本人姓名=姓名",
             "患者姓名=姓名",
             "病历修改日期=转入日期",
-            "病程时间=记录日期"
+            "病程时间=记录日期",
+            "转入诊疗计划=诊疗计划",
+            "诊疗过程描述=诊疗经过",
+            "目前情况=目前病情"
     );
 
     /**************************************************全部*******************************************************/
@@ -201,7 +204,7 @@ public class QiYuanTransferRecordDocTrans extends ModelDocTrans {
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
         transferAllDoc.setText(content);
         transferAllDoc.setStructureMap(structureMap);
-        transferAllDoc.setPageData((Map) sourceMap);
+        transferAllDoc.setPageData((Map) structureMap);
         return transferAllDoc;
     }
 
@@ -243,7 +246,7 @@ public class QiYuanTransferRecordDocTrans extends ModelDocTrans {
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setText(content);
         transferOutDoc.setStructureMap(structureMap);
-        transferOutDoc.setPageData((Map) sourceMap);
+        transferOutDoc.setPageData((Map) structureMap);
 
         return transferOutDoc;
     }
@@ -254,7 +257,10 @@ public class QiYuanTransferRecordDocTrans extends ModelDocTrans {
             "本人姓名=姓名",
             "患者姓名=姓名",
             "病历修改日期=转入日期",
-            "病程时间=记录日期"
+            "病程时间=记录日期",
+            "转入诊疗计划=诊疗计划",
+            "诊疗过程描述=诊疗经过",
+            "目前情况=目前病情"
     );
 
 }