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

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiyuanDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.InputInfo;
@@ -7,7 +7,6 @@ import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.DocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.qiyuan.*;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +18,7 @@ import java.util.stream.Collectors;
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:47
  */
-public class QiyuanDocTrans extends DocTrans {
+public class HangzhoudiqiDocTrans extends DocTrans {
 
     @Override
     protected InputInfo extract(QueryVo queryVo) {

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanBeHospitalizedDocTrans.java

@@ -1,17 +1,13 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
-import com.lantone.qc.dbanaly.util.SpecialStorageUtil;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.label.*;
-import com.lantone.qc.pub.model.vo.BehospitalInfoVO;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
-import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanClinicBloodEffectDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanClinicalBloodDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanConsultationDocTrans.java

@@ -1,10 +1,9 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanCrisisValueReportDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.CrisisValueReportDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

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

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.CriticallyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

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

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanDeathRecordDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

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

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanDoctorAdviceDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanFirstCourseRecordDocTrans.java

@@ -1,21 +1,17 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
-import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import org.apache.commons.lang3.StringUtils;
 
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -41,7 +37,7 @@ public class QiYuanFirstCourseRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = QiYuanXmlUtil.xmlToMap(content);
 //            sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("modeId",ModuleMappingUtil.getDeptModuleId(modeId));
-            List<String> titles = Lists.newArrayList("病历记录时间", "一、病史特点", "一、病例特点", "初步诊断", "入院诊断"
+            List<String> titles = Lists.newArrayList("病历记录时间", "一、病史特点", "一、病例特点", "初步诊断","初步西医诊断","初步中医诊断", "入院诊断"
                     , "鉴别诊断", "诊断依据", "诊疗计划", "既往史", "体格检查","精神检查","辅助检查");
             String text = sourceMap.get("原始文本");
             titles = CommonAnalysisUtil.sortTitles(titles, text);

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanFirstPageRecordDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanInformedConsentDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.lantone.qc.pub.model.doc.InformedConsentDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanLeaveHospitalDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.label.LeaveHospitalDoctorAdviceLabel;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanMedicalRecordInfoDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanNoticeOfConversationDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.lantone.qc.pub.model.doc.NoticeOfConversationDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanOperationDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanOutDepDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.label.ChiefLabel;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanPathologyShipDocTrans.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;

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

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.RescueDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanSeriouslyIllNoticeDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.SeriouslyIllNoticeDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

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

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.StagesSummaryDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;

trans/src/main/java/com/lantone/qc/trans/qiyuan/QiYuanThreeLevelWardDocTrans.java

@@ -1,8 +1,7 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.lt.facade.ModelHospitalFacade;
 import com.lantone.qc.dbanaly.util.KernelConstants;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;

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

@@ -1,9 +1,8 @@
-package com.lantone.qc.trans.qiyuan;
+package com.lantone.qc.trans.hangzhoudiqi;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.facade.yiwu.QiYuanXmlUtil;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferIntoDoc;
 import com.lantone.qc.pub.model.doc.transferrecord.TransferOutDoc;