Merge branch 'master' of http://192.168.2.236:10080/louhr/qc

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0275.java

@@ -18,14 +18,15 @@ import java.util.Map;
 @Component
 public class FIRP0275 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay);//病案首页出院时间
+            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay).toString();//病案首页出院时间
             String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
-            if (CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
-                status = "0";
+            if (!CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
+                status = "-1";
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0276.java

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -22,7 +23,16 @@ public class FIRP0276 extends QCCatalogue {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.outpatientEmergencyDiag);
+            List<Map<String, String>> outpatientEmergencyDiags = (List) firstpageStructureMap.get(Content.outpatientEmergencyDiag);
+            if (ListUtil.isEmpty(outpatientEmergencyDiags)){
+                return;
+            }
+            for (Map<String, String> outpatientEmergencyDiag:outpatientEmergencyDiags) {
+                if (CatalogueUtil.isEmpty(outpatientEmergencyDiag.get(Content.diagCode))){
+                    status = "-1";
+                    return;
+                }
+            }
 
         }
     }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -155,10 +155,10 @@ public class Content {
 
     public static final String medical_classification = "病历分型";
 
-    public static final String outpatientEmergencyDiag = "门急诊诊断";
+    public static final String outpatientEmergencyDiag = "门（急）诊诊断";
     public static final String diagCode = "诊断编码";
     public static final String diagnose_name = "诊断名称";
-    public static final String in_status = "入院情况";
+    public static final String inStatus = "入院情况";
     public static final String out_status = "出院情况";
     public static final String dischargeDiag = "出院诊断";
     public static final String dp_out = "损伤、中毒外部原因";
@@ -175,7 +175,7 @@ public class Content {
     public static final String actualStay = "实际住院天数";//病案首页用
     public static final String drugAllergy = "药物过敏";
     public static final String allergy_drug = "过敏药物";
-    public static final String dead_autopsy = "死亡患者尸检";
+    public static final String deadAutopsy = "死亡患者尸检";
     public static final String bloodType="血型";
     public static final String rhFactor="RH";
     public static final String qc_quality="病案质量";
@@ -204,8 +204,9 @@ public class Content {
     public static final String anesthesia_mode="麻醉方式";
     public static final String anesthesia_doctor="麻醉医师";
     public static final String outWay="离院方式";
+    public static final String brainInjuryComaTime="颅脑损伤患者昏迷时间";
     public static final String daCode="医嘱转院机构名称";
-    public static final String re_hospitalization="31天内再住院计划";
+    public static final String reHospitalization="31天内再住院计划";
 
 
 

public/src/main/java/com/lantone/qc/pub/model/InputInfo.java

@@ -1,6 +1,20 @@
 package com.lantone.qc.pub.model;
 
-import com.lantone.qc.pub.model.doc.*;
+import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
+import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
+import com.lantone.qc.pub.model.doc.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
+import com.lantone.qc.pub.model.doc.DeathRecordDoc;
+import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
+import com.lantone.qc.pub.model.doc.DutyShiftSystemDoc;
+import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
+import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
+import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
+import com.lantone.qc.pub.model.doc.NursingSystemDoc;
+import com.lantone.qc.pub.model.doc.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.PreoperativeDiscussionDoc;
+import com.lantone.qc.pub.model.doc.RescueDoc;
+import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,7 +38,7 @@ public class InputInfo {
      * {"BEH0001":{"PRECOND":"BEH0002,BEH0003,BEH0004"}}
      */
     private Map<String, Map<String, String>> inputCatalogueMap = new HashMap<>();
-    //入院病历
+    //入院记录
     private BeHospitalizedDoc beHospitalizedDoc;
     //输血/血制品病程记录
     private List<ClinicalBloodDoc> clinicalBloodDoc = new ArrayList<>();
@@ -50,10 +64,10 @@ public class InputInfo {
     private List<OperationDiscussionDoc> operationDiscussionDocs = new ArrayList<>();
     //术前讨论、术前小结
     private List<PreoperativeDiscussionDoc> preoperativeDiscussionDocs = new ArrayList<>();
-    //查房记录测试
-    private ThreeLevelWardDoc threeLevelWardDoc;
     //抢救记录
     private List<RescueDoc> rescueDocs = new ArrayList<>();
+    //查房记录
+    private ThreeLevelWardDoc threeLevelWardDoc;
 
     //新增记录
     public <T> void addDoc(List<T> list, T obj) {

public/src/main/java/com/lantone/qc/pub/model/doc/ClinicalBloodDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : ClinicalBloodDoc
- * @Description : 输血/血制品病程记录
+ * @Description : 输血/血制品病程记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:08
  */

public/src/main/java/com/lantone/qc/pub/model/doc/ConsultationDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : ConsultationDoc
- * @Description : 会诊记录
+ * @Description : 会诊记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:06
  */

public/src/main/java/com/lantone/qc/pub/model/doc/DeathCaseDiscussDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : DeathCaseDiscussionDoc
- * @Description : 死亡病例讨论记录
+ * @Description : 死亡病例讨论记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:02
  */

public/src/main/java/com/lantone/qc/pub/model/doc/DeathRecordDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : DeathRecordDoc
- * @Description : 死亡记录
+ * @Description : 死亡记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:11
  */

public/src/main/java/com/lantone/qc/pub/model/doc/DifficultCaseDiscussDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : DifficultCaseDiscussDoc
- * @Description : 疑难病例讨论记录
+ * @Description : 疑难病例讨论记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:03
  */

public/src/main/java/com/lantone/qc/pub/model/doc/DutyShiftSystemDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : DutyShiftSystemDoc
- * @Description : 值班交接制度
+ * @Description : 值班交接制度文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:08
  */

public/src/main/java/com/lantone/qc/pub/model/doc/FirstCourseRecordDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : FirstCourseRecordDoc
- * @Description : 首次病程录
+ * @Description : 首次病程录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:01
  */

public/src/main/java/com/lantone/qc/pub/model/doc/FirstPageRecordDoc.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 /**
  * @ClassName : FirstPageRecordDoc
- * @Description : 病案首页
+ * @Description : 病案首页文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:05
  */

public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : LeaveHospitalDoc
- * @Description : 出院小结
+ * @Description : 出院小结文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 18:58
  */

public/src/main/java/com/lantone/qc/pub/model/doc/NursingSystemDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : NursingSystemDoc
- * @Description : 分级护理制度
+ * @Description : 分级护理制度文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:07
  */

public/src/main/java/com/lantone/qc/pub/model/doc/OperationDiscussionDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : Operation
- * @Description : 术后首次病程及谈话记录
+ * @Description : 术后首次病程及谈话记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:09
  */

public/src/main/java/com/lantone/qc/pub/model/doc/PreoperativeDiscussionDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : PreoperativeDiscussionDoc
- * @Description : 术前讨论、术前小结
+ * @Description : 术前讨论、术前小结文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:10
  */

public/src/main/java/com/lantone/qc/pub/model/doc/RescueDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : RescueDoc
- * @Description : 抢救记录
+ * @Description : 抢救记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-17 15:14
  */

public/src/main/java/com/lantone/qc/pub/model/doc/ThreeLevelWardDoc.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 /**
  * @ClassName : ThreeLevelWardDoc
- * @Description : 查房记录
+ * @Description : 查房记录文档
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:04
  */

public/src/main/java/com/lantone/qc/pub/model/keys/ModelStandardKeys.java

@@ -11,7 +11,27 @@ import java.util.List;
  */
 public class ModelStandardKeys {
 
-    //入院病历的标准key
+    //各大模块的标准title
+    private static final List<String> model_titles = Lists.newArrayList(
+            "入院记录",
+            "输血/血制品病程记录",
+            "会诊记录",
+            "死亡病例讨论记录",
+            "死亡病例讨论记录",
+            "死亡记录",
+            "疑难病例讨论记录",
+            "值班交接制度",
+            "首次病程录",
+            "病案首页",
+            "出院小结",
+            "分级护理制度",
+            "术后首次病程及谈话记录",
+            "术前讨论、术前小结",
+            "抢救记录",
+            "查房记录"
+    );
+
+    //入院记录的标准key
     public static final List<String> beHospitalized = Lists.newArrayList(
             "姓名",
             "性别",
@@ -128,6 +148,9 @@ public class ModelStandardKeys {
             "记录时间"
     );
 
+    //病案首页
+    public static final List<String> FirstPageRecord = Lists.newArrayList();
+
     //出院小结的标准key
     public static final List<String> leaveHospital = Lists.newArrayList(
             "姓名",

public/src/main/java/com/lantone/qc/pub/util/FastJsonUtils.java

@@ -0,0 +1,97 @@
+package com.lantone.qc.pub.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 基于fastjson封装的json转换工具类 (大量数据用)
+ * @author: gaodm
+ * @time: 2018/9/4 12:20
+ */
+public class FastJsonUtils {
+
+
+    /**
+     * 功能描述：把JSON数据转换成指定的java对象
+     *
+     * @param jsonData JSON数据
+     * @param clazz    指定的java对象
+     * @return 指定的java对象
+     */
+    public static <T> T getJsonToBean(String jsonData, Class<T> clazz) {
+        return JSON.parseObject(jsonData, clazz);
+    }
+
+    /**
+     * 功能描述：把java对象转换成JSON数据
+     *
+     * @param object java对象
+     * @return JSON数据
+     */
+    public static String getBeanToJson(Object object) {
+        return JSON.toJSONString(object);
+    }
+
+    /**
+     * 功能描述：把JSON数据转换成指定的java对象列表
+     *
+     * @param jsonData JSON数据
+     * @param clazz    指定的java对象
+     * @return List<T>
+     */
+    public static <T> List<T> getJsonToList(String jsonData, Class<T> clazz) {
+        return JSON.parseArray(jsonData, clazz);
+    }
+
+    /**
+     * 功能描述：把JSON数据转换成较为复杂的List<Map<String, Object>>
+     *
+     * @param jsonData JSON数据
+     * @return List<Map   <   String   ,       Object>>
+     */
+    public static List<Map<String, Object>> getJsonToListMap(String jsonData) {
+        return JSON.parseObject(jsonData, new TypeReference<List<Map<String, Object>>>() {
+        });
+    }
+
+    /***
+     * 解析为列表
+     *
+     * @param jsonString
+     * @param key
+     * @param t
+     * @param <T>
+     * @return
+     */
+    public static <T> ArrayList<T> getJsonToListByKey(String jsonString, String key, Class<T> t) {
+        ArrayList<T> list = new ArrayList<T>();
+        if (StringUtil.isNotBlank(jsonString)) {
+            try {
+                JSONObject jsonObj = JSONObject.parseObject(jsonString);
+                JSONArray inforArray = jsonObj.getJSONArray(key);
+                for (int index = 0; index < inforArray.size(); index++) {
+                    list.add(JSONObject.toJavaObject(
+                            inforArray.getJSONObject(index), t));
+                }
+            } catch (Exception e) {
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 把json转成map
+     * @param jsonString
+     * @return
+     */
+    public static Map<String,Object> getJsonToMap(String jsonString) {
+        JSONObject object = JSONObject.parseObject(jsonString);
+        return object.getInnerMap();
+    }
+}

trans/src/main/java/com/lantone/qc/trans/DocTrans.java

@@ -2,9 +2,6 @@ package com.lantone.qc.trans;
 
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.vo.QueryVo;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.comsis.Preproc;
-import lombok.Getter;
 
 /**
  * @ClassName : DocTrans
@@ -12,16 +9,6 @@ import lombok.Getter;
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:47
  */
-@Getter
 public abstract class DocTrans {
     protected abstract InputInfo extract(QueryVo queryVo);
-
-    private Preproc preproc;
-    private ModelDocGenerate modelDocGenerate;
-
-    public DocTrans() {
-        preproc = new Preproc();
-        modelDocGenerate = new ModelDocGenerate();
-    }
-
 }

trans/src/main/java/com/lantone/qc/trans/ModelDocTrans.java

@@ -1,25 +1,14 @@
 package com.lantone.qc.trans;
 
 import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.comsis.Preproc;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * @Description:
  * @author: rengb
  * @time: 2020/3/6 10:46
  */
-@Getter
-@Setter
 public class ModelDocTrans {
-
-    private Preproc preproc;
-    private ModelDocGenerate modelDocGenerate;
-
     public <T> T extract(MedrecVo medrecVo) {
         return null;
     }
-
 }

trans/src/main/java/com/lantone/qc/trans/changx/BeHospitalizedDocTrans.java

@@ -6,6 +6,8 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.ModelDocGenerate;
+import com.lantone.qc.trans.comsis.Preproc;
 
 import java.util.Map;
 
@@ -31,7 +33,7 @@ public class BeHospitalizedDocTrans extends ModelDocTrans {
         content = content.substring(0, index3) + "\n" + content.substring(index3);
 
         Map<String, String> structureMap =
-                getPreproc().extract_doc_pub(
+                Preproc.extract_doc_pub(
                         false,
                         ListUtil.isEmpty(medrecVo.getLabel()) ? ModelStandardKeys.beHospitalized : medrecVo.getLabel(),
                         content
@@ -42,7 +44,7 @@ public class BeHospitalizedDocTrans extends ModelDocTrans {
         structureMap.remove("体格检查（一）");
         structureMap.remove("体格检查（二）");
 
-        return getModelDocGenerate().beHospitalizedDocGen(structureMap);
+        return ModelDocGenerate.beHospitalizedDocGen(structureMap);
     }
 
 }

trans/src/main/java/com/lantone/qc/trans/changx/ClinicalBloodDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:21
  */
-public class ClinicalBloodDocTrans extends ModelDocTrans {
+public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/ConsultationDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:22
  */
-public class ConsultationDocTrans extends ModelDocTrans {
+public class ChangxConsultationDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/DeathCaseDiscussDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:22
  */
-public class DeathCaseDiscussDocTrans extends ModelDocTrans {
+public class ChangxDeathCaseDiscussDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/DeathRecordDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:23
  */
-public class DeathRecordDocTrans extends ModelDocTrans {
+public class ChangxDeathRecordDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/DifficultCaseDiscussDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:23
  */
-public class DifficultCaseDiscussDocTrans extends ModelDocTrans {
+public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java

@@ -19,64 +19,62 @@ public class ChangxDocTrans extends DocTrans {
         for (MedrecVo i : queryVo.getMedrec()) {
             if (i.getTitle().equals("入院记录")) {
                 BeHospitalizedDocTrans beHospitalizedDocTrans = new BeHospitalizedDocTrans();
-                beHospitalizedDocTrans.setPreproc(getPreproc());
-                beHospitalizedDocTrans.setModelDocGenerate(getModelDocGenerate());
                 inputInfo.setBeHospitalizedDoc(beHospitalizedDocTrans.extract(i));
             }
-            if (i.getTitle().equals("临床用血审核制度")) {
-                ClinicalBloodDocTrans clinicalBloodDocTrans = new ClinicalBloodDocTrans();
+            if (i.getTitle().equals("输血/血制品病程记录")) {
+                ChangxClinicalBloodDocTrans clinicalBloodDocTrans = new ChangxClinicalBloodDocTrans();
                 inputInfo.setClinicalBloodDoc(clinicalBloodDocTrans.extract(i));
             }
-            if (i.getTitle().equals("会诊制度")) {
-                ConsultationDocTrans consultationDocTrans = new ConsultationDocTrans();
+            if (i.getTitle().equals("会诊记录")) {
+                ChangxConsultationDocTrans consultationDocTrans = new ChangxConsultationDocTrans();
                 inputInfo.setConsultationDocs(consultationDocTrans.extract(i));
             }
-            if (i.getTitle().equals("死亡病例讨论制度")) {
-                DeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new DeathCaseDiscussDocTrans();
+            if (i.getTitle().equals("死亡病例讨论记录")) {
+                ChangxDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new ChangxDeathCaseDiscussDocTrans();
                 inputInfo.setDeathCaseDiscussDoc(deathCaseDiscussDocTrans.extract(i));
             }
             if (i.getTitle().equals("死亡记录")) {
-                DeathRecordDocTrans deathRecordDocTrans = new DeathRecordDocTrans();
+                ChangxDeathRecordDocTrans deathRecordDocTrans = new ChangxDeathRecordDocTrans();
                 inputInfo.setDeathRecordDoc(deathRecordDocTrans.extract(i));
             }
-            if (i.getTitle().equals("疑难病例讨论制度")) {
-                DifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new DifficultCaseDiscussDocTrans();
+            if (i.getTitle().equals("疑难病例讨论记录")) {
+                ChangxDifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new ChangxDifficultCaseDiscussDocTrans();
                 inputInfo.setDifficultCaseDiscussDocs(difficultCaseDiscussDocTrans.extract(i));
             }
-            if (i.getTitle().equals("值班及交接班制度")) {
-                DutyShiftSystemDocTrans dutyShiftSystemDocTrans = new DutyShiftSystemDocTrans();
+            if (i.getTitle().equals("值班交接制度")) {
+                ChangxDutyShiftSystemDocTrans dutyShiftSystemDocTrans = new ChangxDutyShiftSystemDocTrans();
                 inputInfo.setDutyShiftSystemDocs(dutyShiftSystemDocTrans.extract(i));
             }
             if (i.getTitle().equals("首次病程录")) {
-                FirstCourseRecordDocTrans firstCourseRecordDocTrans = new FirstCourseRecordDocTrans();
+                ChangxFirstCourseRecordDocTrans firstCourseRecordDocTrans = new ChangxFirstCourseRecordDocTrans();
                 inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
             }
             if (i.getTitle().equals("病案首页")) {
-                FirstPageRecordDocTrans firstPageRecordDocTrans = new FirstPageRecordDocTrans();
+                ChangxFirstPageRecordDocTrans firstPageRecordDocTrans = new ChangxFirstPageRecordDocTrans();
                 inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
             }
             if (i.getTitle().equals("出院小结")) {
-                LeaveHospitalDocTrans leaveHospitalDocTrans = new LeaveHospitalDocTrans();
+                ChangxLeaveHospitalDocTrans leaveHospitalDocTrans = new ChangxLeaveHospitalDocTrans();
                 inputInfo.setLeaveHospitalDoc(leaveHospitalDocTrans.extract(i));
             }
             if (i.getTitle().equals("分级护理制度")) {
-                NursingSystemDocTrans nursingSystemDocTrans = new NursingSystemDocTrans();
+                ChangxNursingSystemDocTrans nursingSystemDocTrans = new ChangxNursingSystemDocTrans();
                 inputInfo.setNursingSystemDoc(nursingSystemDocTrans.extract(i));
             }
-            if (i.getTitle().equals("围手术期病历讨论及记录")) {
-                OperationDiscussionDocTrans operationDiscussionDocTrans = new OperationDiscussionDocTrans();
+            if (i.getTitle().equals("术后首次病程及谈话记录")) {
+                ChangxOperationDiscussionDocTrans operationDiscussionDocTrans = new ChangxOperationDiscussionDocTrans();
                 inputInfo.setOperationDiscussionDocs(operationDiscussionDocTrans.extract(i));
             }
-            if (i.getTitle().equals("术前讨论制度")) {
-                PreoperativeDiscussionDocTrans preoperativeDiscussionDocTrans = new PreoperativeDiscussionDocTrans();
+            if (i.getTitle().equals("术前讨论、术前小结")) {
+                ChangxPreoperativeDiscussionDocTrans preoperativeDiscussionDocTrans = new ChangxPreoperativeDiscussionDocTrans();
                 inputInfo.setPreoperativeDiscussionDocs(preoperativeDiscussionDocTrans.extract(i));
             }
             if (i.getTitle().equals("抢救记录")) {
-                RescueDocTrans rescueDocTrans = new RescueDocTrans();
+                ChangxRescueDocTrans rescueDocTrans = new ChangxRescueDocTrans();
                 inputInfo.setPreoperativeDiscussionDocs(rescueDocTrans.extract(i));
             }
-            if (i.getTitle().equals("三级查房制度")) {
-                ThreeLevelWardDocTrans threeLevelWardDocTrans = new ThreeLevelWardDocTrans();
+            if (i.getTitle().equals("查房记录")) {
+                ChangxThreeLevelWardDocTrans threeLevelWardDocTrans = new ChangxThreeLevelWardDocTrans();
                 inputInfo.setThreeLevelWardDoc(threeLevelWardDocTrans.extract(i));
             }
         }

trans/src/main/java/com/lantone/qc/trans/changx/DutyShiftSystemDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:24
  */
-public class DutyShiftSystemDocTrans extends ModelDocTrans {
+public class ChangxDutyShiftSystemDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/FirstCourseRecordDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:25
  */
-public class FirstCourseRecordDocTrans extends ModelDocTrans {
+public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstPageRecordDocTrans.java

@@ -0,0 +1,36 @@
+package com.lantone.qc.trans.changx;
+
+import com.google.common.collect.Maps;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
+import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.pub.util.FastJsonUtils;
+import com.lantone.qc.trans.ModelDocTrans;
+
+import java.util.Map;
+
+/**
+ * @Description: 病案首页文档生成
+ * @author: 胡敬
+ * @time: 2020/3/16 17:47
+ */
+public class ChangxFirstPageRecordDocTrans extends ModelDocTrans {
+
+    @Override
+    public FirstPageRecordDoc extract(MedrecVo medrecVo) {
+        Map<String, String> content = (Map) medrecVo.getContent();
+        FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
+        firstPageRecordDoc.setStructureMap(content);
+
+        Map<String, Object> structureExtMap = Maps.newHashMap();
+        structureExtMap.put(Content.diagnose_cts, FastJsonUtils.getJsonToBean(content.get(Content.diagnose_cts), Object.class));
+        structureExtMap.put(Content.outpatientEmergencyDiag, FastJsonUtils.getJsonToBean(content.get(Content.outpatientEmergencyDiag), Object.class));
+        structureExtMap.put(Content.operative_information, FastJsonUtils.getJsonToBean(content.get(Content.operative_information), Object.class));
+        structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
+        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
+        firstPageRecordDoc.setStructureExtMap(structureExtMap);
+
+        return firstPageRecordDoc;
+    }
+
+}

trans/src/main/java/com/lantone/qc/trans/changx/LeaveHospitalDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:25
  */
-public class LeaveHospitalDocTrans extends ModelDocTrans {
+public class ChangxLeaveHospitalDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/NursingSystemDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:26
  */
-public class NursingSystemDocTrans extends ModelDocTrans {
+public class ChangxNursingSystemDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/OperationDiscussionDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:26
  */
-public class OperationDiscussionDocTrans extends ModelDocTrans {
+public class ChangxOperationDiscussionDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/PreoperativeDiscussionDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:26
  */
-public class PreoperativeDiscussionDocTrans extends ModelDocTrans {
+public class ChangxPreoperativeDiscussionDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/RescueDocTrans.java

@@ -3,9 +3,9 @@ package com.lantone.qc.trans.changx;
 import com.lantone.qc.trans.ModelDocTrans;
 
 /**
- * @Description: 抢救记录
+ * @Description: 抢救记录文档生成
  * @author: rengb
  * @time: 2020/3/17 17:34
  */
-public class RescueDocTrans extends ModelDocTrans {
+public class ChangxRescueDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/ThreeLevelWardDocTrans.java

@@ -7,5 +7,5 @@ import com.lantone.qc.trans.ModelDocTrans;
  * @author: rengb
  * @time: 2020/3/17 13:27
  */
-public class ThreeLevelWardDocTrans extends ModelDocTrans {
+public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
 }

trans/src/main/java/com/lantone/qc/trans/changx/FirstPageRecordDocTrans.java

@@ -1,24 +0,0 @@
-package com.lantone.qc.trans.changx;
-
-import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-
-import java.util.Map;
-
-/**
- * @Description: 病案首页文档生成
- * @author: 胡敬
- * @time: 2020/3/16 17:47
- */
-public class FirstPageRecordDocTrans extends ModelDocTrans {
-
-    @Override
-    public FirstPageRecordDoc extract(MedrecVo medrecVo) {
-        Map<String, String> content = (Map) medrecVo.getContent();
-        FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
-        firstPageRecordDoc.setStructureMap(content);
-        return firstPageRecordDoc;
-    }
-
-}

trans/src/main/java/com/lantone/qc/trans/comsis/ModelDocGenerate.java

@@ -1,7 +1,17 @@
 package com.lantone.qc.trans.comsis;
 
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
-import com.lantone.qc.pub.model.label.*;
+import com.lantone.qc.pub.model.label.ChiefLabel;
+import com.lantone.qc.pub.model.label.DiagLabel;
+import com.lantone.qc.pub.model.label.FamilyLabel;
+import com.lantone.qc.pub.model.label.MaritalLabel;
+import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.model.label.PacsLabel;
+import com.lantone.qc.pub.model.label.PastLabel;
+import com.lantone.qc.pub.model.label.PersonalLabel;
+import com.lantone.qc.pub.model.label.PresentLabel;
+import com.lantone.qc.pub.model.label.VitalLabel;
+import com.lantone.qc.pub.model.label.VitalLabelSpecial;
 
 import java.util.Map;
 
@@ -20,7 +30,7 @@ public class ModelDocGenerate {
      * @param structureMap
      * @return
      */
-    public BeHospitalizedDoc beHospitalizedDocGen(Map<String, String> structureMap) {
+    public static BeHospitalizedDoc beHospitalizedDocGen(Map<String, String> structureMap) {
         BeHospitalizedDoc beHospitalizedDoc = new BeHospitalizedDoc();
 
         ChiefLabel chiefLabel = new ChiefLabel();
@@ -44,7 +54,7 @@ public class ModelDocGenerate {
         structureMap.remove("个人史");
 
         MaritalLabel maritalLabel = new MaritalLabel();
-        maritalLabel.setText("婚育史: "+structureMap.get("婚育史"));
+        maritalLabel.setText("婚育史: " + structureMap.get("婚育史"));
         beHospitalizedDoc.setMaritalLabel(maritalLabel);
         structureMap.remove("婚育史");
 

trans/src/main/java/com/lantone/qc/trans/comsis/Preproc.java

@@ -25,7 +25,7 @@ public class Preproc {
      * @param line       需处理字符串
      * @return
      */
-    public Map<String, String> extract_doc_pub(boolean isProgress, List<String> title, String line) {
+    public static Map<String, String> extract_doc_pub(boolean isProgress, List<String> title, String line) {
         line = line.replaceAll("[　*| *| *]*", "");
         int pos = 0;
         int ln_pos = 0;