添加数据补录功能代码

pom.xml

@@ -33,7 +33,7 @@
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
         <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
-        <aggregator.version>1.1.0</aggregator.version>
+        <aggregator.version>1.1.3</aggregator.version>
         <okhttp.version>4.2.2</okhttp.version>
         <easypoi.version>4.2.0</easypoi.version>
         <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>

src/main/java/com/diagbot/aggregate/HisDataSupplementAggregate.java

@@ -0,0 +1,262 @@
+package com.diagbot.aggregate;
+
+import com.alibaba.fastjson.JSONObject;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.his.*;
+import com.diagbot.facade.data.*;
+import com.diagbot.facade.his.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.data.*;
+import com.google.common.collect.Lists;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisDataSupplementAggregate {
+
+    @Autowired
+    private HisBehospitalInfoFacade hisBehospitalInfoFacade;
+    @Autowired
+    private HisDoctorAdviceFacade hisDoctorAdviceFacade;
+    @Autowired
+    private HisHomePageFacade hisHomePageFacade;
+    @Autowired
+    private HisHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
+    @Autowired
+    private HisHomeOperationInfoFacade hisHomeOperationInfoFacade;
+    @Autowired
+    private HisMedicalRecordFacade hisMedicalRecordFacade;
+    @Autowired
+    private HisMedicalRecordContentFacade hisMedicalRecordContentFacade;
+
+    @Autowired
+    private ABehospitalInfoFacade aBehospitalInfoFacade;
+    @Autowired
+    private ADoctorAdviceFacade aDoctorAdviceFacade;
+    @Autowired
+    private AHomePageFacade aHomePageFacade;
+    @Autowired
+    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+    @Autowired
+    private AHomeOperationInfoFacade aHomeOperationInfoFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+
+    @DataProvider("dataSupplement")
+    public RespDTO dataSupplement(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> list,
+                                  @DataConsumer("getHisBeHospitalInfoData") RespDTO beHospitalInfoResp,
+                                  @DataConsumer("getHisDoctorAdviceData") RespDTO doctorAdviceResp,
+                                  @DataConsumer("getHisHomePageData") RespDTO homePageResp,
+                                  @DataConsumer("getHisHomeDiagnoseInfoData") RespDTO homeDiagnoseInfoResp,
+                                  @DataConsumer("getHisHomeOperationInfoData") RespDTO homeOperationInfoResp,
+                                  @DataConsumer("getHisMedicalRecordData") RespDTO medicalRecordResp,
+                                  @DataConsumer("getHisMedicalRecordContentData") RespDTO medicalRecordContentResp) {
+        StringBuffer sb = new StringBuffer();
+        if (beHospitalInfoResp.code.equals("0")
+                && doctorAdviceResp.code.equals("0")
+                && homePageResp.code.equals("0")
+                && homeDiagnoseInfoResp.code.equals("0")
+                && homeOperationInfoResp.code.equals("0")
+                && medicalRecordResp.code.equals("0")
+                && medicalRecordContentResp.code.equals("0")) {
+            return RespDTO.onSuc("数据补录成功!");
+        } else {
+            if (beHospitalInfoResp.code.equals("-1")) {
+                sb.append(beHospitalInfoResp.msg);
+            }
+            if (doctorAdviceResp.code.equals("-1")) {
+                sb.append(doctorAdviceResp.msg);
+            }
+            if (homePageResp.code.equals("-1")) {
+                sb.append(homePageResp.msg);
+            }
+            if (homeDiagnoseInfoResp.code.equals("-1")) {
+                sb.append(homeDiagnoseInfoResp.msg);
+            }
+            if (homeOperationInfoResp.code.equals("-1")) {
+                sb.append(homeOperationInfoResp.msg);
+            }
+            if (medicalRecordResp.code.equals("-1")) {
+                sb.append(medicalRecordResp.msg);
+            }
+            if (medicalRecordContentResp.code.equals("-1")) {
+                sb.append(medicalRecordContentResp.msg);
+            }
+            return RespDTO.onError(sb.toString());
+        }
+
+    }
+
+    //视图获取入院登记信息
+    @DataProvider("getHisBeHospitalInfoData")
+    public RespDTO getHisBeHospitalInfoData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<ABehospitalInfoVO> aList = Lists.newLinkedList();
+        List<HisBehospitalInfo> list = hisBehospitalInfoFacade.getHisBeHospitalInfoData(aBehospitalInfoVO);
+        try {
+            if (list != null && list.size() > 0) {
+                for (HisBehospitalInfo hisBehospitalInfo : list) {
+                    ABehospitalInfoVO a = new ABehospitalInfoVO();
+                    BeanUtil.copyProperties(hisBehospitalInfo, a);
+                    aList.add(a);
+                }
+                RespDTO resp = aBehospitalInfoFacade.executeBehospital(aList);
+                if (resp.code.equals("-1")) {
+                    return RespDTO.onError(resp.msg + "=====入院登记补录失败，入参:" + JSONObject.toJSONString(aList));
+                }
+            } else {
+                return RespDTO.onError("未从视图中查询到需要补录的入院登记数据!");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return RespDTO.onSuc("补录成功!");
+    }
+
+    //视图获取医嘱信息
+    @DataProvider("getHisDoctorAdviceData")
+    public RespDTO getHisDoctorAdviceData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<ADoctorAdviceVO>> aList = Lists.newLinkedList();
+        List<List<HisDoctorAdvice>> list = hisDoctorAdviceFacade.getHisDoctorAdviceData(aBehospitalInfoVO);
+        if (aList != null && aList.size() > 0) {
+            RespDTO resp;
+            BeanUtil.copyProperties(list, aList);
+            for (List<ADoctorAdviceVO> aDoctorAdviceVO : aList) {
+                try {
+                    resp = aDoctorAdviceFacade.executeDoctorAdvice(aDoctorAdviceVO);
+                    if (resp.code.equals("-1")) {
+                        return RespDTO.onError(resp.msg + "=====医嘱信息补录失败，入参:" + JSONObject.toJSONString(aDoctorAdviceVO));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return RespDTO.onError("未从视图中查询到需要补录的医嘱信息数据!");
+        }
+        return RespDTO.onSuc("补录成功!");
+    }
+
+    //视图获取病案首页信息
+    @DataProvider("getHisHomePageData")
+    public RespDTO getHisHomePageData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<AHomePageVO> aList = Lists.newLinkedList();
+        List<HisHomePage> list = hisHomePageFacade.getHomePageData(aBehospitalInfoVO);
+        try {
+            if (list != null && list.size() > 0) {
+                BeanUtil.copyProperties(list, aList);
+                RespDTO resp = aHomePageFacade.executeHomePage(aList);
+                if (resp.code.equals(-1)) {
+                    return RespDTO.onError(resp.msg + "=====病案首页补录失败，入参:" + JSONObject.toJSONString(aList));
+                }
+            } else {
+                return RespDTO.onError("未从视图中查询到需要补录的病案首页数据!");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return RespDTO.onSuc("补录成功!");
+    }
+
+    //视图获取病案首页诊断信息
+    @DataProvider("getHisHomeDiagnoseInfoData")
+    public RespDTO getHisHomeDiagnoseInfoData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<AHomeDiagnoseVO>> aList = Lists.newLinkedList();
+        List<List<HisHomeDiagnoseInfo>> list = hisHomeDiagnoseInfoFacade.getHisHomeDiagnoseInfoData(aBehospitalInfoVO);
+        if (aList != null && aList.size() > 0) {
+            BeanUtil.copyProperties(list, aList);
+            RespDTO resp;
+            for (List<AHomeDiagnoseVO> aHomeDiagnoseVO : aList) {
+                try {
+                    resp = aHomeDiagnoseInfoFacade.executeHomeDiagnose(aHomeDiagnoseVO);
+                    if (resp.code.equals(-1)) {
+                        return RespDTO.onError(resp.msg + "=====病案首页诊断补录失败，入参:" + JSONObject.toJSONString(aHomeDiagnoseVO));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return RespDTO.onError("未从视图中查询到需要补录的病案首页诊断数据!");
+        }
+        return RespDTO.onSuc("补录成功！");
+    }
+
+    //视图获取病案首页手术信息
+    @DataProvider("getHisHomeOperationInfoData")
+    public RespDTO getHisHomeOperationInfoData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<AHomeOperationVO>> aList = Lists.newLinkedList();
+        List<List<HisHomeOperationInfo>> list = hisHomeOperationInfoFacade.getHisHomeOperationInfoData(aBehospitalInfoVO);
+        if (aList != null && aList.size() > 0) {
+            BeanUtil.copyProperties(list, aList);
+            for (List<AHomeOperationVO> aHomeOperationVO : aList) {
+                RespDTO resp;
+                try {
+                    resp = aHomeOperationInfoFacade.executeHomeOperation(aHomeOperationVO);
+                    if (resp.code.equals(-1)) {
+                        return RespDTO.onError(resp.msg + "=====病案首页手术补录失败，入参:" + JSONObject.toJSONString(aHomeOperationVO));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return RespDTO.onError("未从视图中查询到需要补录的病案首页手术数据!");
+        }
+        return RespDTO.onSuc("补录成功！");
+    }
+
+    //视图获取文书信息
+    @DataProvider("getHisMedicalRecordData")
+    public RespDTO getHisMedicalRecordData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<AMedicalRecordVO>> aList = Lists.newLinkedList();
+        List<List<HisMedicalRecord>> list = hisMedicalRecordFacade.getHisMedicalRecordData(aBehospitalInfoVO);
+        if (aList != null && aList.size() > 0) {
+            BeanUtil.copyProperties(list, aList);
+            RespDTO resp;
+            for (List<AMedicalRecordVO> aMedicalRecordVO : aList) {
+                try {
+                    resp = aMedicalRecordFacade.executeMrRecord(aMedicalRecordVO);
+                    if (resp.code.equals(-1)) {
+                        return RespDTO.onError(resp.msg + "=====文书信息补录失败，入参:" + JSONObject.toJSONString(aMedicalRecordVO));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return RespDTO.onError("未从视图中查询到需要补录的文书信息数据!");
+        }
+        return RespDTO.onSuc("补录成功！");
+    }
+
+    //视图获取文书内容
+    @DataProvider("getHisMedicalRecordContentData")
+    public RespDTO getHisMedicalRecordContentData(@InvokeParameter("aBehospitalInfoVO") List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<AMedicalRecordContentVO>> aList = Lists.newLinkedList();
+        List<List<HisMedicalRecordContent>> list = hisMedicalRecordContentFacade.getHisMedicalRecordContentData(aBehospitalInfoVO);
+        if (aList != null && aList.size() > 0) {
+            BeanUtil.copyProperties(list, aList);
+            RespDTO resp;
+            for (List<AMedicalRecordContentVO> aMedicalRecordContentVO : aList) {
+                try {
+                    resp = aMedicalRecordContentFacade.executeMrRecordContent(aMedicalRecordContentVO);
+                    if (resp.code.equals(-1)) {
+                        return RespDTO.onError(resp.msg + "=====文书内容补录失败，入参:" + JSONObject.toJSONString(aMedicalRecordContentVO));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            return RespDTO.onError("未从视图中查询到需要补录的文书内容数据!");
+        }
+        return RespDTO.onSuc("补录成功！");
+    }
+}

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -245,6 +245,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/saveMedicaIndicator").permitAll()
                 .antMatchers("/qc/medCheckInfo/createMedBeHospitalInfoType").permitAll()
                 .antMatchers("/qc/medCheckInfo/addMedCheckInfo").permitAll()
+                .antMatchers("/qc/data/dataSupplement").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -289,6 +289,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/saveMedicaIndicator", request)
                 || matchers("/qc/medCheckInfo/createMedBeHospitalInfoType", request)
                 || matchers("/qc/medCheckInfo/addMedCheckInfo", request)
+                || matchers("/qc/data/dataSupplement", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/entity/his/HisBehospitalInfo.java

@@ -1,161 +1,101 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 住院病历信息
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_behospital_info")
-@Data
+@TableName("HIS_BEHOSPITAL_INFO")
 public class HisBehospitalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 病人住院ID
-     */
+    @TableField("BEHOSPITAL_CODE")
     private String behospitalCode;
 
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 姓名
-     */
+    @TableField("NAME")
     private String name;
 
-    /**
-     * 性别（男，女）
-     */
+    @TableField("SEX")
     private String sex;
 
-    /**
-     * 出生日期
-     */
+    @TableField("BIRTHDAY")
     private Date birthday;
 
-    /**
-     * 档案号
-     */
+    @TableField("FILE_CODE")
     private String fileCode;
 
-    /**
-     * 质控类型
-     */
-    private Long qcTypeId;
-
-    /**
-     * 病区编码
-     */
+    @TableField("WARD_CODE")
     private String wardCode;
 
-    /**
-     * 病区名称
-     */
+    @TableField("WARD_NAME")
     private String wardName;
 
-    /**
-     * 住院科室ID
-     */
+    @TableField("BEH_DEPT_ID")
     private String behDeptId;
 
-    /**
-     * 住院科室名称
-     */
+    @TableField("BEH_DEPT_NAME")
     private String behDeptName;
 
-    /**
-     * 床位号
-     */
+    @TableField("BED_CODE")
     private String bedCode;
 
-    /**
-     * 床位名称
-     */
+    @TableField("BED_NAME")
     private String bedName;
 
-    /**
-     * 医保类别
-     */
+    @TableField("INSURANCE_NAME")
     private String insuranceName;
 
-    /**
-     * 职业
-     */
+    @TableField("JOB_TYPE")
     private String jobType;
 
-    /**
-     * 入院时间
-     */
+    @TableField("BEHOSPITAL_DATE")
     private Date behospitalDate;
 
-    /**
-     * 出院时间
-     */
+    @TableField("LEAVE_HOSPITAL_DATE")
     private Date leaveHospitalDate;
 
-    /**
-     * 疾病ICD编码
-     */
-    private String diagnoseIcd;
+    @TableField("TRANS_IN_TIME")
+    private Date transInTime;
 
-    /**
-     * 疾病名称
-     */
-    private String diagnose;
+    @TableField("TRANS_OUT_TIME")
+    private Date transOutTime;
 
-    /**
-     * 住院医生ID
-     */
-    private String behDoctorId;
-
-    /**
-     * 住院医生姓名
-     */
-    private String behDoctorName;
+    @TableField("DIAGNOSE_ICD")
+    private String diagnoseIcd;
 
-    /**
-     * 主治医生ID
-     */
+    @TableField("DOCTOR_ID")
     private String doctorId;
 
-    /**
-     * 主治医生姓名
-     */
+    @TableField("DOCTOR_NAME")
     private String doctorName;
 
-    /**
-     * 主任医生ID
-     */
+    @TableField("BEH_DOCTOR_ID")
+    private String behDoctorId;
+
+    @TableField("BEH_DOCTOR_NAME")
+    private String behDoctorName;
+
+    @TableField("DIRECTOR_DOCTOR_ID")
     private String directorDoctorId;
 
-    /**
-     * 主任医生姓名
-     */
+    @TableField("DIRECTOR_DOCTOR_NAME")
     private String directorDoctorName;
 
-    /**
-     * 是否归档（0：未归档，1：已归档）
-     */
-    private String isPlacefile;
+    @TableField("DIAGNOSE")
+    private String diagnose;
 
-    /**
-     * 归档时间
-     */
-    private Date placefileDate;
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
 
     public String getBehospitalCode() {
         return behospitalCode;
@@ -165,14 +105,6 @@ public class HisBehospitalInfo implements Serializable {
         this.behospitalCode = behospitalCode;
     }
 
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
     public String getName() {
         return name;
     }
@@ -205,14 +137,6 @@ public class HisBehospitalInfo implements Serializable {
         this.fileCode = fileCode;
     }
 
-    public Long getQcTypeId() {
-        return qcTypeId;
-    }
-
-    public void setQcTypeId(Long qcTypeId) {
-        this.qcTypeId = qcTypeId;
-    }
-
     public String getWardCode() {
         return wardCode;
     }
@@ -293,36 +217,28 @@ public class HisBehospitalInfo implements Serializable {
         this.leaveHospitalDate = leaveHospitalDate;
     }
 
-    public String getDiagnoseIcd() {
-        return diagnoseIcd;
+    public Date getTransInTime() {
+        return transInTime;
     }
 
-    public void setDiagnoseIcd(String diagnoseIcd) {
-        this.diagnoseIcd = diagnoseIcd;
+    public void setTransInTime(Date transInTime) {
+        this.transInTime = transInTime;
     }
 
-    public String getDiagnose() {
-        return diagnose;
-    }
-
-    public void setDiagnose(String diagnose) {
-        this.diagnose = diagnose;
+    public Date getTransOutTime() {
+        return transOutTime;
     }
 
-    public String getBehDoctorId() {
-        return behDoctorId;
+    public void setTransOutTime(Date transOutTime) {
+        this.transOutTime = transOutTime;
     }
 
-    public void setBehDoctorId(String behDoctorId) {
-        this.behDoctorId = behDoctorId;
-    }
-
-    public String getBehDoctorName() {
-        return behDoctorName;
+    public String getDiagnoseIcd() {
+        return diagnoseIcd;
     }
 
-    public void setBehDoctorName(String behDoctorName) {
-        this.behDoctorName = behDoctorName;
+    public void setDiagnoseIcd(String diagnoseIcd) {
+        this.diagnoseIcd = diagnoseIcd;
     }
 
     public String getDoctorId() {
@@ -341,6 +257,22 @@ public class HisBehospitalInfo implements Serializable {
         this.doctorName = doctorName;
     }
 
+    public String getBehDoctorId() {
+        return behDoctorId;
+    }
+
+    public void setBehDoctorId(String behDoctorId) {
+        this.behDoctorId = behDoctorId;
+    }
+
+    public String getBehDoctorName() {
+        return behDoctorName;
+    }
+
+    public void setBehDoctorName(String behDoctorName) {
+        this.behDoctorName = behDoctorName;
+    }
+
     public String getDirectorDoctorId() {
         return directorDoctorId;
     }
@@ -357,32 +289,30 @@ public class HisBehospitalInfo implements Serializable {
         this.directorDoctorName = directorDoctorName;
     }
 
-    public String getIsPlacefile() {
-        return isPlacefile;
+    public String getDiagnose() {
+        return diagnose;
     }
 
-    public void setIsPlacefile(String isPlacefile) {
-        this.isPlacefile = isPlacefile;
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose;
     }
 
-    public Date getPlacefileDate() {
-        return placefileDate;
+    public Long getHospitalId() {
+        return hospitalId;
     }
 
-    public void setPlacefileDate(Date placefileDate) {
-        this.placefileDate = placefileDate;
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
     }
 
     @Override
     public String toString() {
-        return "MedBehospitalInfo{" +
+        return "HisBehospitalInfo{" +
                 "behospitalCode=" + behospitalCode +
-                ", hospitalId=" + hospitalId +
                 ", name=" + name +
                 ", sex=" + sex +
                 ", birthday=" + birthday +
                 ", fileCode=" + fileCode +
-                ", qcTypeId=" + qcTypeId +
                 ", wardCode=" + wardCode +
                 ", wardName=" + wardName +
                 ", behDeptId=" + behDeptId +
@@ -393,14 +323,18 @@ public class HisBehospitalInfo implements Serializable {
                 ", jobType=" + jobType +
                 ", behospitalDate=" + behospitalDate +
                 ", leaveHospitalDate=" + leaveHospitalDate +
+                ", transInTime=" + transInTime +
+                ", transOutTime=" + transOutTime +
                 ", diagnoseIcd=" + diagnoseIcd +
-                ", diagnose=" + diagnose +
-                ", behDoctorId=" + behDoctorId +
-                ", behDoctorName=" + behDoctorName +
                 ", doctorId=" + doctorId +
                 ", doctorName=" + doctorName +
+                ", behDoctorId=" + behDoctorId +
+                ", behDoctorName=" + behDoctorName +
                 ", directorDoctorId=" + directorDoctorId +
                 ", directorDoctorName=" + directorDoctorName +
+                ", diagnose=" + diagnose +
+                ", hospitalId=" + hospitalId +
                 "}";
     }
+
 }

src/main/java/com/diagbot/entity/his/HisDoctorAdvice.java

@@ -1,170 +1,303 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 病人医嘱
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_doctor_advice")
-@Data
+@TableName("HIS_DOCTOR_ADVICE")
 public class HisDoctorAdvice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 病人医嘱ID
-     */
-    @TableId(value = "doctor_advice_id",type = IdType.INPUT)
+    @TableField("DOCTOR_ADVICE_ID")
     private String doctorAdviceId;
 
-    /**
-     * 病人ID
-     */
+    @TableField("BEHOSPITAL_CODE")
     private String behospitalCode;
 
-    /**
-     * 医生开单判别
-     */
+    @TableField("ORDER_DOCTOR_NAME")
     private String orderDoctorName;
 
-    /**
-     * 医嘱频率判别
-     */
+    @TableField("FREQUENCY")
     private String frequency;
 
-    /**
-     * 父类医嘱ID
-     */
+    @TableField("PARENT_TYPE_ID")
     private String parentTypeId;
 
-    /**
-     * 医嘱类型判别(嘱托长嘱、长期医嘱等)
-     */
+    @TableField("DOCTOR_ADVICE_TYPE")
     private String doctorAdviceType;
 
-    /**
-     * 一次使用数量
-     */
+    @TableField("USAGE_NUM")
     private String usageNum;
 
-    /**
-     * 一次用量单位
-     */
+    @TableField("USAGE_UNIT")
     private String usageUnit;
 
-    /**
-     * 医嘱单次剂量
-     */
+    @TableField("DOSE")
     private String dose;
 
-    /**
-     * 单次剂量单位
-     */
+    @TableField("DOSE_UNIT")
     private String doseUnit;
 
-    /**
-     * 给药方式
-     */
+    @TableField("MED_MODE_TYPE")
     private String medModeType;
 
-    /**
-     * 医嘱频率
-     */
+    @TableField("DA_FREQUENCY")
     private String daFrequency;
 
-    /**
-     * 医嘱处理类型
-     */
+    @TableField("DA_DEAL_TYPE")
     private String daDealType;
 
-    /**
-     * 医嘱开始时间
-     */
+    @TableField("DA_START_DATE")
     private Date daStartDate;
 
-    /**
-     * 医嘱项目名称
-     */
+    @TableField("DA_ITEM_NAME")
     private String daItemName;
 
-    /**
-     * 医嘱状态判别
-     */
+    @TableField("DA_STATUS")
     private String daStatus;
 
-    /**
-     * 医嘱结束时间
-     */
+    @TableField("DA_STOP_DATE")
     private Date daStopDate;
 
-    /**
-     * 医嘱同组序号
-     */
+    @TableField("DA_GROUP_NO")
     private String daGroupNo;
 
-    /**
-     * 医嘱处方类型(检验、描述医嘱、膳食、西药、护理等)
-     */
+    @TableField("DA_PRESCRIPTION_TYPE")
     private String daPrescriptionType;
 
-    /**
-     * 药品类型(0.普药 1.抗生素 2.激素)
-     */
+    @TableField("MEDICINE_TYPE")
     private String medicineType;
 
-    /**
-     * 医嘱领药类型
-     */
+    @TableField("DA_MED_TYPE")
     private String daMedType;
 
-    /**
-     * 医生嘱托
-     */
+    @TableField("DOCTOR_NOTICE")
     private String doctorNotice;
 
-    /**
-     * 开单医生ID
-     */
+    @TableField("DOCTOR_ID")
     private String doctorId;
 
-    /**
-     * 开单医生姓名
-     */
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    @TableField("DOCTOR_NAME")
     private String doctorName;
 
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
+    public String getDoctorAdviceId() {
+        return doctorAdviceId;
+    }
+
+    public void setDoctorAdviceId(String doctorAdviceId) {
+        this.doctorAdviceId = doctorAdviceId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getOrderDoctorName() {
+        return orderDoctorName;
+    }
+
+    public void setOrderDoctorName(String orderDoctorName) {
+        this.orderDoctorName = orderDoctorName;
+    }
+    public String getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(String frequency) {
+        this.frequency = frequency;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getDoctorAdviceType() {
+        return doctorAdviceType;
+    }
+
+    public void setDoctorAdviceType(String doctorAdviceType) {
+        this.doctorAdviceType = doctorAdviceType;
+    }
+    public String getUsageNum() {
+        return usageNum;
+    }
+
+    public void setUsageNum(String usageNum) {
+        this.usageNum = usageNum;
+    }
+    public String getUsageUnit() {
+        return usageUnit;
+    }
+
+    public void setUsageUnit(String usageUnit) {
+        this.usageUnit = usageUnit;
+    }
+    public String getDose() {
+        return dose;
+    }
+
+    public void setDose(String dose) {
+        this.dose = dose;
+    }
+    public String getDoseUnit() {
+        return doseUnit;
+    }
+
+    public void setDoseUnit(String doseUnit) {
+        this.doseUnit = doseUnit;
+    }
+    public String getMedModeType() {
+        return medModeType;
+    }
+
+    public void setMedModeType(String medModeType) {
+        this.medModeType = medModeType;
+    }
+    public String getDaFrequency() {
+        return daFrequency;
+    }
+
+    public void setDaFrequency(String daFrequency) {
+        this.daFrequency = daFrequency;
+    }
+    public String getDaDealType() {
+        return daDealType;
+    }
+
+    public void setDaDealType(String daDealType) {
+        this.daDealType = daDealType;
+    }
+    public Date getDaStartDate() {
+        return daStartDate;
+    }
+
+    public void setDaStartDate(Date daStartDate) {
+        this.daStartDate = daStartDate;
+    }
+    public String getDaItemName() {
+        return daItemName;
+    }
+
+    public void setDaItemName(String daItemName) {
+        this.daItemName = daItemName;
+    }
+    public String getDaStatus() {
+        return daStatus;
+    }
+
+    public void setDaStatus(String daStatus) {
+        this.daStatus = daStatus;
+    }
+    public Date getDaStopDate() {
+        return daStopDate;
+    }
+
+    public void setDaStopDate(Date daStopDate) {
+        this.daStopDate = daStopDate;
+    }
+    public String getDaGroupNo() {
+        return daGroupNo;
+    }
+
+    public void setDaGroupNo(String daGroupNo) {
+        this.daGroupNo = daGroupNo;
+    }
+    public String getDaPrescriptionType() {
+        return daPrescriptionType;
+    }
+
+    public void setDaPrescriptionType(String daPrescriptionType) {
+        this.daPrescriptionType = daPrescriptionType;
+    }
+    public String getMedicineType() {
+        return medicineType;
+    }
+
+    public void setMedicineType(String medicineType) {
+        this.medicineType = medicineType;
+    }
+    public String getDaMedType() {
+        return daMedType;
+    }
+
+    public void setDaMedType(String daMedType) {
+        this.daMedType = daMedType;
+    }
+    public String getDoctorNotice() {
+        return doctorNotice;
+    }
+
+    public void setDoctorNotice(String doctorNotice) {
+        this.doctorNotice = doctorNotice;
+    }
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    @Override
+    public String toString() {
+        return "HisDoctorAdvice{" +
+                "doctorAdviceId=" + doctorAdviceId +
+                ", behospitalCode=" + behospitalCode +
+                ", orderDoctorName=" + orderDoctorName +
+                ", frequency=" + frequency +
+                ", parentTypeId=" + parentTypeId +
+                ", doctorAdviceType=" + doctorAdviceType +
+                ", usageNum=" + usageNum +
+                ", usageUnit=" + usageUnit +
+                ", dose=" + dose +
+                ", doseUnit=" + doseUnit +
+                ", medModeType=" + medModeType +
+                ", daFrequency=" + daFrequency +
+                ", daDealType=" + daDealType +
+                ", daStartDate=" + daStartDate +
+                ", daItemName=" + daItemName +
+                ", daStatus=" + daStatus +
+                ", daStopDate=" + daStopDate +
+                ", daGroupNo=" + daGroupNo +
+                ", daPrescriptionType=" + daPrescriptionType +
+                ", medicineType=" + medicineType +
+                ", daMedType=" + daMedType +
+                ", doctorNotice=" + doctorNotice +
+                ", doctorId=" + doctorId +
+                ", hospitalId=" + hospitalId +
+                ", doctorName=" + doctorName +
+                "}";
+    }
 }

src/main/java/com/diagbot/entity/his/HisHomeDiagnoseInfo.java

@@ -1,56 +1,162 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_home_diagnose_info")
-@Data
+@TableName("HIS_HOME_DIAGNOSE_INFO")
 public class HisHomeDiagnoseInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 病案首页ID
-     */
-    @TableId(value = "home_page_id",type = IdType.INPUT)
+    @TableField("HOME_PAGE_ID")
     private String homePageId;
 
-    /**
-     * 诊断序号
-     */
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("DIAGNOSE_ORDER_NO")
     private String diagnoseOrderNo;
 
-    /**
-     * 诊断类别（主要诊断、其他诊断）
-     */
+    @TableField("DIAGNOSE_TYPE")
     private String diagnoseType;
 
-    /**
-     * 诊断判别（主、次）
-     */
+    @TableField("DIAGNOSE_TYPE_SHORT")
     private String diagnoseTypeShort;
 
+    @TableField("DIAGNOSE_NAME")
     private String diagnoseName;
 
+    @TableField("BEHOSPITAL_TYPE")
     private String behospitalType;
 
+    @TableField("LEAVE_HOSPITAL_TYPE")
     private String leaveHospitalType;
 
+    @TableField("PATHOLOGY_DIAGNOSE")
     private String pathologyDiagnose;
 
+    @TableField("ICD_CODE")
     private String icdCode;
 
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getHomePageId() {
+        return homePageId;
+    }
+
+    public void setHomePageId(String homePageId) {
+        this.homePageId = homePageId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public String getDiagnoseOrderNo() {
+        return diagnoseOrderNo;
+    }
+
+    public void setDiagnoseOrderNo(String diagnoseOrderNo) {
+        this.diagnoseOrderNo = diagnoseOrderNo;
+    }
+
+    public String getDiagnoseType() {
+        return diagnoseType;
+    }
+
+    public void setDiagnoseType(String diagnoseType) {
+        this.diagnoseType = diagnoseType;
+    }
+
+    public String getDiagnoseTypeShort() {
+        return diagnoseTypeShort;
+    }
+
+    public void setDiagnoseTypeShort(String diagnoseTypeShort) {
+        this.diagnoseTypeShort = diagnoseTypeShort;
+    }
+
+    public String getDiagnoseName() {
+        return diagnoseName;
+    }
+
+    public void setDiagnoseName(String diagnoseName) {
+        this.diagnoseName = diagnoseName;
+    }
+
+    public String getBehospitalType() {
+        return behospitalType;
+    }
+
+    public void setBehospitalType(String behospitalType) {
+        this.behospitalType = behospitalType;
+    }
+
+    public String getLeaveHospitalType() {
+        return leaveHospitalType;
+    }
+
+    public void setLeaveHospitalType(String leaveHospitalType) {
+        this.leaveHospitalType = leaveHospitalType;
+    }
+
+    public String getPathologyDiagnose() {
+        return pathologyDiagnose;
+    }
+
+    public void setPathologyDiagnose(String pathologyDiagnose) {
+        this.pathologyDiagnose = pathologyDiagnose;
+    }
+
+    public String getIcdCode() {
+        return icdCode;
+    }
+
+    public void setIcdCode(String icdCode) {
+        this.icdCode = icdCode;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    @Override
+    public String toString() {
+        return "HisHomeDiagnoseInfo{" +
+                "homePageId='" + homePageId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", diagnoseOrderNo='" + diagnoseOrderNo + '\'' +
+                ", diagnoseType='" + diagnoseType + '\'' +
+                ", diagnoseTypeShort='" + diagnoseTypeShort + '\'' +
+                ", diagnoseName='" + diagnoseName + '\'' +
+                ", behospitalType='" + behospitalType + '\'' +
+                ", leaveHospitalType='" + leaveHospitalType + '\'' +
+                ", pathologyDiagnose='" + pathologyDiagnose + '\'' +
+                ", icdCode='" + icdCode + '\'' +
+                ", hospitalId=" + hospitalId +
+                '}';
+    }
 }

src/main/java/com/diagbot/entity/his/HisHomeOperationInfo.java

@@ -1,101 +1,219 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_home_operation_info")
-@Data
+@TableName("HIS_HOME_OPERATION_INFO")
 public class HisHomeOperationInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 病案首页ID
-     */
-    @TableId(value = "home_page_id",type = IdType.INPUT)
+    @TableField("HOME_PAGE_ID")
     private String homePageId;
 
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
 
-    /**
-     * 手术序号
-     */
+    @TableField("OPERATION_ORDER_NO")
     private String operationOrderNo;
 
-    /**
-     * 手术日期
-     */
+    @TableField("OPERATION_DATE")
     private Date operationDate;
 
-    /**
-     * 手术编码
-     */
+    @TableField("OPERATION_CODE")
     private String operationCode;
 
-    /**
-     * 手术医生ID
-     */
+    @TableField("OPERATION_DOCTOR_ID")
     private String operationDoctorId;
 
-    /**
-     * 一助医生ID
-     */
+    @TableField("FIRST_ASSISTANT_ID")
     private String firstAssistantId;
 
-    /**
-     * 二助医生ID
-     */
+    @TableField("SECOND_ASSISTANT_ID")
     private String secondAssistantId;
 
-    /**
-     * 切口等级
-     */
+    @TableField("CUT_LEVEL")
     private String cutLevel;
 
-    /**
-     * 愈合等级
-     */
+    @TableField("HEALING_LEVEL")
     private String healingLevel;
 
-    /**
-     * 手术名称
-     */
+    @TableField("OPERATION_NAME")
     private String operationName;
 
-    /**
-     * 手术级别
-     */
+    @TableField("OPERATION_LEVEL")
     private String operationLevel;
 
-    /**
-     * 麻醉方式（全麻、局麻、静脉麻醉）
-     */
+    @TableField("ANAESTHESIA_NAME")
     private String anaesthesiaName;
 
-    /**
-     * 拟手术名称
-     */
+    @TableField("ANAESTHESIA_DOCTOR")
+    private String anaesthesiaDoctor;
+
+    @TableField("SHAM_OPERATION_NAME")
     private String shamOperationName;
 
-    /**
-     * 麻醉医师
-     */
-    private String anaesthesiaDoctor;
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    public String getHomePageId() {
+        return homePageId;
+    }
+
+    public void setHomePageId(String homePageId) {
+        this.homePageId = homePageId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public String getOperationOrderNo() {
+        return operationOrderNo;
+    }
+
+    public void setOperationOrderNo(String operationOrderNo) {
+        this.operationOrderNo = operationOrderNo;
+    }
+
+    public Date getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
 
+    public String getOperationCode() {
+        return operationCode;
+    }
+
+    public void setOperationCode(String operationCode) {
+        this.operationCode = operationCode;
+    }
+
+    public String getOperationDoctorId() {
+        return operationDoctorId;
+    }
+
+    public void setOperationDoctorId(String operationDoctorId) {
+        this.operationDoctorId = operationDoctorId;
+    }
+
+    public String getFirstAssistantId() {
+        return firstAssistantId;
+    }
+
+    public void setFirstAssistantId(String firstAssistantId) {
+        this.firstAssistantId = firstAssistantId;
+    }
+
+    public String getSecondAssistantId() {
+        return secondAssistantId;
+    }
+
+    public void setSecondAssistantId(String secondAssistantId) {
+        this.secondAssistantId = secondAssistantId;
+    }
+
+    public String getCutLevel() {
+        return cutLevel;
+    }
+
+    public void setCutLevel(String cutLevel) {
+        this.cutLevel = cutLevel;
+    }
+
+    public String getHealingLevel() {
+        return healingLevel;
+    }
+
+    public void setHealingLevel(String healingLevel) {
+        this.healingLevel = healingLevel;
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
+    public String getOperationLevel() {
+        return operationLevel;
+    }
+
+    public void setOperationLevel(String operationLevel) {
+        this.operationLevel = operationLevel;
+    }
+
+    public String getAnaesthesiaName() {
+        return anaesthesiaName;
+    }
+
+    public void setAnaesthesiaName(String anaesthesiaName) {
+        this.anaesthesiaName = anaesthesiaName;
+    }
+
+    public String getAnaesthesiaDoctor() {
+        return anaesthesiaDoctor;
+    }
+
+    public void setAnaesthesiaDoctor(String anaesthesiaDoctor) {
+        this.anaesthesiaDoctor = anaesthesiaDoctor;
+    }
+
+    public String getShamOperationName() {
+        return shamOperationName;
+    }
+
+    public void setShamOperationName(String shamOperationName) {
+        this.shamOperationName = shamOperationName;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    @Override
+    public String toString() {
+        return "HisHomeOperationInfo{" +
+                "homePageId='" + homePageId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", operationOrderNo='" + operationOrderNo + '\'' +
+                ", operationDate=" + operationDate +
+                ", operationCode='" + operationCode + '\'' +
+                ", operationDoctorId='" + operationDoctorId + '\'' +
+                ", firstAssistantId='" + firstAssistantId + '\'' +
+                ", secondAssistantId='" + secondAssistantId + '\'' +
+                ", cutLevel='" + cutLevel + '\'' +
+                ", healingLevel='" + healingLevel + '\'' +
+                ", operationName='" + operationName + '\'' +
+                ", operationLevel='" + operationLevel + '\'' +
+                ", anaesthesiaName='" + anaesthesiaName + '\'' +
+                ", anaesthesiaDoctor='" + anaesthesiaDoctor + '\'' +
+                ", shamOperationName='" + shamOperationName + '\'' +
+                ", hospitalId=" + hospitalId +
+                '}';
+    }
 }

src/main/java/com/diagbot/entity/his/HisMedicalRecord.java

@@ -1,58 +1,105 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_medical_record")
-@Data
+@TableName("HIS_MEDICAL_RECORD")
 public class HisMedicalRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "rec_id",type = IdType.INPUT)
+    @TableField("REC_ID")
     private String recId;
 
-    /**
-     * 病人住院ID
-     */
+    @TableField("BEHOSPITAL_CODE")
     private String behospitalCode;
 
-    /**
-     * 组织机构代码
-     */
+    @TableField("ORG_CODE")
     private String orgCode;
 
-    /**
-     * 病历类别编号
-     */
+    @TableField("REC_TYPE_ID")
     private String recTypeId;
 
-    /**
-     * 病历日期
-     */
+    @TableField("REC_DATE")
     private Date recDate;
 
-    /**
-     * 病历标题
-     */
+    @TableField("REC_TITLE")
     private String recTitle;
 
-    /**
-     * 模板处理状态(0:未处理，1：已处理)
-     */
-    private Integer status;
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+    public String getRecTypeId() {
+        return recTypeId;
+    }
+
+    public void setRecTypeId(String recTypeId) {
+        this.recTypeId = recTypeId;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
 
+    @Override
+    public String toString() {
+        return "HisMedicalRecord{" +
+                "recId=" + recId +
+                ", behospitalCode=" + behospitalCode +
+                ", orgCode=" + orgCode +
+                ", recTypeId=" + recTypeId +
+                ", recDate=" + recDate +
+                ", recTitle=" + recTitle +
+                ", hospitalId=" + hospitalId +
+                "}";
+    }
 }

src/main/java/com/diagbot/entity/his/HisMedicalRecordContent.java

@@ -1,52 +1,86 @@
 package com.diagbot.entity.his;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 
 import java.io.Serializable;
-import java.sql.Blob;
-import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author zhoutg
- * @since 2020-04-13
+ * @author lipc
+ * @since 2021-09-28
  */
-@TableName("his_medical_record_content")
-@Data
+@TableName("HIS_MEDICAL_RECORD_CONTENT")
 public class HisMedicalRecordContent implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 病历ID
-     */
-    @TableId(value = "rec_id",type = IdType.INPUT)
+    @TableField("REC_ID")
     private String recId;
 
-    /**
-     * 文书内容（blob）
-     */
-    private Blob contentBlob;
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
 
-    /**
-     * 病历文本（文本）
-     */
-    private String contentText;
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
 
-    /**
-     * html文本信息
-     */
+    @TableField("HTML_TEXT")
     private String htmlText;
 
-    /**
-     * xml文本信息
-     */
+    @TableField("XML_TEXT")
     private String xmlText;
 
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getHtmlText() {
+        return htmlText;
+    }
+
+    public void setHtmlText(String htmlText) {
+        this.htmlText = htmlText;
+    }
+
+    public String getXmlText() {
+        return xmlText;
+    }
+
+    public void setXmlText(String xmlText) {
+        this.xmlText = xmlText;
+    }
+
+    @Override
+    public String toString() {
+        return "HisMedicalRecordContent{" +
+                "recId='" + recId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", hospitalId=" + hospitalId +
+                ", htmlText='" + htmlText + '\'' +
+                ", xmlText='" + xmlText + '\'' +
+                '}';
+    }
 }

src/main/java/com/diagbot/facade/his/HisBehospitalInfoFacade.java

@@ -0,0 +1,27 @@
+package com.diagbot.facade.his;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.service.impl.his.HisBehospitalInfoServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisBehospitalInfoFacade extends HisBehospitalInfoServiceImpl {
+
+    public List<HisBehospitalInfo> getHisBeHospitalInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<HisBehospitalInfo> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            HisBehospitalInfo hisBehospitalInfo = this.baseMapper.selectOne(new QueryWrapper<HisBehospitalInfo>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisBehospitalInfo != null) {
+                list.add(hisBehospitalInfo);
+            }
+        });
+        return list;
+    }
+}

src/main/java/com/diagbot/facade/his/HisDoctorAdviceFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade.his;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisDoctorAdvice;
+import com.diagbot.service.impl.his.HisDoctorAdviceServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisDoctorAdviceFacade extends HisDoctorAdviceServiceImpl {
+
+    public List<List<HisDoctorAdvice>> getHisDoctorAdviceData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+
+        List<List<HisDoctorAdvice>> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            List<HisDoctorAdvice> hisDoctorAdvice = this.baseMapper.selectList(new QueryWrapper<HisDoctorAdvice>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisDoctorAdvice != null && hisDoctorAdvice.size() > 0) {
+                list.add(hisDoctorAdvice);
+            }
+        });
+        return list;
+    }
+}

src/main/java/com/diagbot/facade/his/HisHomeDiagnoseInfoFacade.java

@@ -1,10 +1,29 @@
 package com.diagbot.facade.his;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.entity.his.HisHomeDiagnoseInfo;
 import com.diagbot.service.impl.his.HisHomeDiagnoseInfoServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class HisHomeDiagnoseInfoFacade extends HisHomeDiagnoseInfoServiceImpl {
 
+    public List<List<HisHomeDiagnoseInfo>> getHisHomeDiagnoseInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
 
+        List<List<HisHomeDiagnoseInfo>> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            List<HisHomeDiagnoseInfo> hisHomeDiagnoseInfo = this.baseMapper.selectList(new QueryWrapper<HisHomeDiagnoseInfo>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisHomeDiagnoseInfo != null && hisHomeDiagnoseInfo.size() > 0) {
+                list.add(hisHomeDiagnoseInfo);
+            }
+        });
+        return list;
+    }
 }

src/main/java/com/diagbot/facade/his/HisHomeOperationInfoFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade.his;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisHomeOperationInfo;
+import com.diagbot.service.impl.his.HisHomeOperationInfoServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisHomeOperationInfoFacade extends HisHomeOperationInfoServiceImpl {
+
+    public List<List<HisHomeOperationInfo>> getHisHomeOperationInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+
+        List<List<HisHomeOperationInfo>> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            List<HisHomeOperationInfo> hisHomeOperationInfo = this.baseMapper.selectList(new QueryWrapper<HisHomeOperationInfo>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisHomeOperationInfo != null && hisHomeOperationInfo.size() > 0) {
+                list.add(hisHomeOperationInfo);
+            }
+        });
+        return list;
+    }
+}

src/main/java/com/diagbot/facade/his/HisHomePageFacade.java

@@ -1,34 +1,27 @@
 package com.diagbot.facade.his;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.dto.AnalyzeRunDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AHomePageDTO;
-import com.diagbot.entity.HomePage;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
-import com.diagbot.facade.data.AHomeOperationInfoFacade;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.service.impl.HomePageServiceImpl;
+import com.diagbot.entity.his.HisHomePage;
 import com.diagbot.service.impl.his.HisHomePageServiceImpl;
-import com.diagbot.util.*;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.*;
+import com.diagbot.vo.data.ABehospitalInfoVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Component
 public class HisHomePageFacade extends HisHomePageServiceImpl {
 
+    public List<HisHomePage> getHomePageData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<HisHomePage> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            HisHomePage hisHomePage = this.baseMapper.selectOne(new QueryWrapper<HisHomePage>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisHomePage != null) {
+                list.add(hisHomePage);
+            }
+        });
+        return list;
+    }
 }

src/main/java/com/diagbot/facade/his/HisMedicalRecordContentFacade.java

@@ -0,0 +1,26 @@
+package com.diagbot.facade.his;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisMedicalRecordContent;
+import com.diagbot.service.impl.his.HisMedicalRecordContentServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisMedicalRecordContentFacade extends HisMedicalRecordContentServiceImpl {
+    public List<List<HisMedicalRecordContent>> getHisMedicalRecordContentData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<HisMedicalRecordContent>> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            List<HisMedicalRecordContent> hisMedicalRecordContent = this.baseMapper.selectList(new QueryWrapper<HisMedicalRecordContent>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisMedicalRecordContent != null && hisMedicalRecordContent.size() > 0) {
+                list.add(hisMedicalRecordContent);
+            }
+        });
+        return list;
+    }
+}

src/main/java/com/diagbot/facade/his/HisMedicalRecordFacade.java

@@ -0,0 +1,27 @@
+package com.diagbot.facade.his;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.entity.his.HisMedicalRecord;
+import com.diagbot.service.impl.his.HisMedicalRecordServiceImpl;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
+    public List<List<HisMedicalRecord>> getHisMedicalRecordData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+        List<List<HisMedicalRecord>> list = Lists.newLinkedList();
+        aBehospitalInfoVO.stream().forEach(s -> {
+            List<HisMedicalRecord> hisMedicalRecord = this.baseMapper.selectList(new QueryWrapper<HisMedicalRecord>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (hisMedicalRecord != null) {
+                list.add(hisMedicalRecord);
+            }
+        });
+        return list;
+    }
+}

src/main/java/com/diagbot/service/HisMedicalRecordContentService.java

@@ -0,0 +1,7 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.his.HisMedicalRecordContent;
+
+public interface HisMedicalRecordContentService extends IService<HisMedicalRecordContent> {
+}

src/main/java/com/diagbot/service/his/HisBehospitalInfoService.java

@@ -0,0 +1,9 @@
+package com.diagbot.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.his.HisBehospitalInfo;
+
+public interface HisBehospitalInfoService extends IService<HisBehospitalInfo> {
+
+
+}

src/main/java/com/diagbot/service/his/HisDoctorAdviceService.java

@@ -0,0 +1,7 @@
+package com.diagbot.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.his.HisDoctorAdvice;
+
+public interface HisDoctorAdviceService extends IService<HisDoctorAdvice> {
+}

src/main/java/com/diagbot/service/his/HisMedicalRecordService.java

@@ -0,0 +1,7 @@
+package com.diagbot.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.his.HisMedicalRecord;
+
+public interface HisMedicalRecordService extends IService<HisMedicalRecord> {
+}

src/main/java/com/diagbot/service/impl/his/HisBehospitalInfoServiceImpl.java

@@ -0,0 +1,13 @@
+package com.diagbot.service.impl.his;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.mapper.HisBehospitalInfoMapper;
+import com.diagbot.service.his.HisBehospitalInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class HisBehospitalInfoServiceImpl extends ServiceImpl<HisBehospitalInfoMapper, HisBehospitalInfo> implements HisBehospitalInfoService {
+}

src/main/java/com/diagbot/service/impl/his/HisDoctorAdviceServiceImpl.java

@@ -0,0 +1,13 @@
+package com.diagbot.service.impl.his;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.his.HisDoctorAdvice;
+import com.diagbot.mapper.HisDoctorAdviceMapper;
+import com.diagbot.service.his.HisDoctorAdviceService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class HisDoctorAdviceServiceImpl  extends ServiceImpl<HisDoctorAdviceMapper, HisDoctorAdvice> implements HisDoctorAdviceService {
+}

src/main/java/com/diagbot/service/impl/his/HisMedicalRecordContentServiceImpl.java

@@ -0,0 +1,13 @@
+package com.diagbot.service.impl.his;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.his.HisMedicalRecordContent;
+import com.diagbot.mapper.HisMedicalRecordContentMapper;
+import com.diagbot.service.HisMedicalRecordContentService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class HisMedicalRecordContentServiceImpl  extends ServiceImpl<HisMedicalRecordContentMapper, HisMedicalRecordContent> implements HisMedicalRecordContentService {
+}

src/main/java/com/diagbot/service/impl/his/HisMedicalRecordServiceImpl.java

@@ -0,0 +1,13 @@
+package com.diagbot.service.impl.his;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.his.HisMedicalRecord;
+import com.diagbot.mapper.HisMedicalRecordMapper;
+import com.diagbot.service.his.HisMedicalRecordService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class HisMedicalRecordServiceImpl extends ServiceImpl<HisMedicalRecordMapper, HisMedicalRecord> implements HisMedicalRecordService {
+}

src/main/java/com/diagbot/web/DataController.java

@@ -1,9 +1,11 @@
 package com.diagbot.web;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.*;
 import com.diagbot.facade.data.*;
 import com.diagbot.vo.data.*;
+import io.github.lvyahui8.spring.facade.DataFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,12 +15,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @RestController
 @RequestMapping("/qc/data")
-@Api(value = "对接接口API", tags = { "对接接口API" })
+@Api(value = "对接接口API", tags = {"对接接口API"})
 public class DataController {
     @Autowired
     private ABasDoctorInfoFacade aBasDoctorInfoFacade;
@@ -51,118 +55,119 @@ public class DataController {
     @Autowired
     private AMedLisInfoFacade aMedLisInfoFacade;
 
+
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
-    public RespDTO sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
+    public RespDTO sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list) {
         return aBasDoctorInfoFacade.executeDoctor(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院所有有效科室的基本信息")
     @PostMapping("/sendDeptInfos")
     @SysLogger("sendDeptInfos")
-    public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list){
+    public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list) {
         return aBasDeptInfoFacade.executeDept(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院所有文书模板基本信息")
     @PostMapping("/sendRecordTypes")
     @SysLogger("sendRecordTypes")
-    public RespDTO<List<AMedicalRecordTypeDTO>> sendRecordTypes(@RequestBody List<AMedicalRecordTypeVO> list){
+    public RespDTO<List<AMedicalRecordTypeDTO>> sendRecordTypes(@RequestBody List<AMedicalRecordTypeVO> list) {
         return aMedRecordTypeFacade.executeMRType(list);
     }
 
     @ApiOperation(value = "运行质控-评分-文书信息")
     @PostMapping("/sendMrRecordIng")
     @SysLogger("sendMrRecordIng")
-    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO){
+    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO) {
         return aMedicalRecordFacade.executeMrRecordIng(aMrContentVO);
     }
 
     @ApiOperation(value = "终末质控-文书信息")
     @PostMapping("/sendMrRecord")
     @SysLogger("sendMrRecord")
-    public RespDTO<List<AMedicalRecordDTO>> sendMrRecord(@RequestBody List<AMedicalRecordVO> list){
+    public RespDTO<List<AMedicalRecordDTO>> sendMrRecord(@RequestBody List<AMedicalRecordVO> list) {
         return aMedicalRecordFacade.executeMrRecord(list);
     }
 
     @ApiOperation(value = "终末质控-文书详情")
     @PostMapping("/sendMrContent")
     @SysLogger("sendMrContent")
-    public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list){
+    public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list) {
         return aMedicalRecordContentFacade.executeMrRecordContent(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")
     @PostMapping("/sendPatientInfo")
     @SysLogger("sendPatientInfo")
-    public RespDTO<List<ABehospitalInfoDTO>> sendPatientInfo(@RequestBody List<ABehospitalInfoVO> list){
+    public RespDTO<List<ABehospitalInfoDTO>> sendPatientInfo(@RequestBody List<ABehospitalInfoVO> list) {
         return aBehospitalInfoFacade.executeBehospital(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院医生医嘱信息")
     @PostMapping("/sendDoctorAdvice")
     @SysLogger("sendDoctorAdvice")
-    public RespDTO<List<ADoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<ADoctorAdviceVO> list){
+    public RespDTO<List<ADoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<ADoctorAdviceVO> list) {
         return aDoctorAdviceFacade.executeDoctorAdvice(list);
     }
 
     @ApiOperation(value = "运行质控-获取病案首页")
     @PostMapping("/sendHomePageIng")
     @SysLogger("sendHomePageIng")
-    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO){
+    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO) {
         return aHomePageFacade.executeHomePageIng(aHomePageIngVO);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页")
     @PostMapping("/sendHomePage")
     @SysLogger("sendHomePage")
-    public RespDTO<List<AHomePageDTO>> sendHomePage(@RequestBody List<AHomePageVO> list){
+    public RespDTO<List<AHomePageDTO>> sendHomePage(@RequestBody List<AHomePageVO> list) {
         return aHomePageFacade.executeHomePage(list);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页诊断")
     @PostMapping("/sendHomeDiagnose")
     @SysLogger("sendHomeDiagnose")
-    public RespDTO<List<AHomeDiagnoseDTO>> sendHomeDiagnose(@RequestBody List<AHomeDiagnoseVO> list){
+    public RespDTO<List<AHomeDiagnoseDTO>> sendHomeDiagnose(@RequestBody List<AHomeDiagnoseVO> list) {
         return aHomeDiagnoseInfoFacade.executeHomeDiagnose(list);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页手术")
     @PostMapping("/sendHomeOperation")
     @SysLogger("sendHomeOperation")
-    public RespDTO<List<AHomeOperationDTO>> sendHomeOperation(@RequestBody List<AHomeOperationVO> list){
+    public RespDTO<List<AHomeOperationDTO>> sendHomeOperation(@RequestBody List<AHomeOperationVO> list) {
         return RespDTO.onSuc(aHomeOperationInfoFacade.executeHomeOperation(list));
     }
 
     @ApiOperation(value = "数据引擎-获取危急值")
     @PostMapping("/sendCrisis")
     @SysLogger("sendCrisis")
-    public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list){
+    public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list) {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
 
     @ApiOperation(value = "数据引擎-删除标识")
     @PostMapping("/deleteFlag")
     @SysLogger("deleteFlag")
-    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
-        if("brzyxx".equals(aDeleteFlagVO.getModeType())){
+    public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO) {
+        if ("brzyxx".equals(aDeleteFlagVO.getModeType())) {
             return aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("bryz".equals(aDeleteFlagVO.getModeType())){
+        } else if ("bryz".equals(aDeleteFlagVO.getModeType())) {
             return aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyxx".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyxx".equals(aDeleteFlagVO.getModeType())) {
             return aHomePageFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyzd".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyzd".equals(aDeleteFlagVO.getModeType())) {
             return aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("basyss".equals(aDeleteFlagVO.getModeType())){
+        } else if ("basyss".equals(aDeleteFlagVO.getModeType())) {
             return aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
-        }else if("wsxx".equals(aDeleteFlagVO.getModeType())){
+        } else if ("wsxx".equals(aDeleteFlagVO.getModeType())) {
             return aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
-        }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
+        } else if ("wsnr".equals(aDeleteFlagVO.getModeType())) {
             return aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
-        }else if("hyjg".equals(aDeleteFlagVO.getModeType())){
+        } else if ("hyjg".equals(aDeleteFlagVO.getModeType())) {
             return aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
-        }else if("jcjg".equals(aDeleteFlagVO.getModeType())){
+        } else if ("jcjg".equals(aDeleteFlagVO.getModeType())) {
             return aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
         }
         return RespDTO.onSuc(true);
@@ -171,45 +176,45 @@ public class DataController {
     @ApiOperation(value = "数据引擎-归档标识")
     @PostMapping("/placeFile")
     @SysLogger("placeFile")
-    public RespDTO placeFileFlag(@RequestBody APlaceFileVO aPlaceFileVO){
+    public RespDTO placeFileFlag(@RequestBody APlaceFileVO aPlaceFileVO) {
         return aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
     }
 
     @ApiOperation(value = "检查结果")
     @PostMapping("/sendPacsResults")
     @SysLogger("sendPacsResults")
-    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list){
+    public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list) {
         return aMedPacsResultFacade.executeMedPacsResult(list);
     }
 
     @ApiOperation(value = "化验结果")
     @PostMapping("/sendLisResults")
     @SysLogger("sendLisResults")
-    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list){
+    public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list) {
         return aMedLisResultFacade.executeMedLisResult(list);
     }
 
     @ApiOperation(value = "检查信息")
     @PostMapping("/sendPacsInfos")
     @SysLogger("sendPacsInfos")
-    public RespDTO sendPacsInfos(@RequestBody List<AMedPacsInfoVO> list){
+    public RespDTO sendPacsInfos(@RequestBody List<AMedPacsInfoVO> list) {
         return aMedPacsInfoFacade.dealData(list);
     }
 
     @ApiOperation(value = "化验信息")
     @PostMapping("/sendLisInfos")
     @SysLogger("sendLisInfos")
-    public RespDTO sendLisInfos(@RequestBody List<AMedLisInfoVO> list){
+    public RespDTO sendLisInfos(@RequestBody List<AMedLisInfoVO> list) {
         return aMedLisInfoFacade.dealData(list);
     }
 
     @ApiOperation(value = "数据引擎-历史数据结构化处理")
     @PostMapping("/hisDataDeal")
     @SysLogger("hisDataDeal")
-    public RespDTO<List<AMedCrisisDTO>> hisDataDeal(@RequestBody HisDataDealVO hisDataDealVO){
+    public RespDTO<List<AMedCrisisDTO>> hisDataDeal(@RequestBody HisDataDealVO hisDataDealVO) {
         boolean b = true;
         try {
-             b = aMedicalRecordFacade.hisDataDeal(hisDataDealVO);
+            b = aMedicalRecordFacade.hisDataDeal(hisDataDealVO);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -233,4 +238,19 @@ public class DataController {
         columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getContent());
         return RespDTO.onSuc(true);
     }*/
+
+    @ApiOperation(value = "his数据补录")
+    @PostMapping("/dataSupplement")
+    @SysLogger("dataSupplement")
+    public RespDTO dataSupplement(@RequestBody List<ABehospitalInfoVO> list) {
+        RespDTO respDTO = null;
+        try {
+            Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("aBehospitalInfoVO", list);
+            respDTO = DataFacade.get("dataSupplement", invokeParams, RespDTO.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return respDTO;
+    }
 }

src/main/resources/mapper/HisBehospitalInfoMapper.xml

@@ -5,32 +5,32 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisBehospitalInfo">
-        <id column="behospital_code" property="behospitalCode"/>
-        <result column="name" property="name"/>
-        <result column="sex" property="sex"/>
-        <result column="birthday" property="birthday"/>
-        <result column="file_code" property="fileCode"/>
-        <result column="ward_code" property="wardCode"/>
-        <result column="ward_name" property="wardName"/>
-        <result column="beh_dept_id" property="behDeptId"/>
-        <result column="beh_dept_name" property="behDeptName"/>
-        <result column="bed_code" property="bedCode"/>
-        <result column="bed_name" property="bedName"/>
-        <result column="insurance_name" property="insuranceName"/>
-        <result column="job_type" property="jobType"/>
-        <result column="behospital_date" property="behospitalDate"/>
-        <result column="leave_hospital_date" property="leaveHospitalDate"/>
-        <result column="diagnose_icd" property="diagnoseIcd"/>
-        <result column="diagnose" property="diagnose"/>
-        <result column="beh_doctor_id" property="behDoctorId"/>
-        <result column="beh_doctor_name" property="behDoctorName"/>
-        <result column="doctor_id" property="doctorId"/>
-        <result column="doctor_name" property="doctorName"/>
-        <result column="director_doctor_id" property="directorDoctorId"/>
-        <result column="director_doctor_name" property="directorDoctorName"/>
-        <result column="is_placefile" property="isPlacefile"/>
-        <result column="placefile_date" property="placefileDate"/>
-        <result column="linkman" property="linkman"/>
+        <result column="BEHOSPITAL_CODE" property="behospitalCode" />
+        <result column="NAME" property="name" />
+        <result column="SEX" property="sex" />
+        <result column="BIRTHDAY" property="birthday" />
+        <result column="FILE_CODE" property="fileCode" />
+        <result column="WARD_CODE" property="wardCode" />
+        <result column="WARD_NAME" property="wardName" />
+        <result column="BEH_DEPT_ID" property="behDeptId" />
+        <result column="BEH_DEPT_NAME" property="behDeptName" />
+        <result column="BED_CODE" property="bedCode" />
+        <result column="BED_NAME" property="bedName" />
+        <result column="INSURANCE_NAME" property="insuranceName" />
+        <result column="JOB_TYPE" property="jobType" />
+        <result column="BEHOSPITAL_DATE" property="behospitalDate" />
+        <result column="LEAVE_HOSPITAL_DATE" property="leaveHospitalDate" />
+        <result column="TRANS_IN_TIME" property="transInTime" />
+        <result column="TRANS_OUT_TIME" property="transOutTime" />
+        <result column="DIAGNOSE_ICD" property="diagnoseIcd" />
+        <result column="DOCTOR_ID" property="doctorId" />
+        <result column="DOCTOR_NAME" property="doctorName" />
+        <result column="BEH_DOCTOR_ID" property="behDoctorId" />
+        <result column="BEH_DOCTOR_NAME" property="behDoctorName" />
+        <result column="DIRECTOR_DOCTOR_ID" property="directorDoctorId" />
+        <result column="DIRECTOR_DOCTOR_NAME" property="directorDoctorName" />
+        <result column="DIAGNOSE" property="diagnose" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisDoctorAdviceMapper.xml

@@ -4,30 +4,31 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisDoctorAdvice">
-        <id column="doctor_advice_id" property="doctorAdviceId"/>
-        <result column="behospital_code" property="behospitalCode"/>
-        <result column="order_doctor_name" property="orderDoctorName"/>
-        <result column="frequency" property="frequency"/>
-        <result column="parent_type_id" property="parentTypeId"/>
-        <result column="doctor_advice_type" property="doctorAdviceType"/>
-        <result column="usage_num" property="usageNum"/>
-        <result column="usage_unit" property="usageUnit"/>
-        <result column="dose" property="dose"/>
-        <result column="dose_unit" property="doseUnit"/>
-        <result column="med_mode_type" property="medModeType"/>
-        <result column="da_frequency" property="daFrequency"/>
-        <result column="da_deal_type" property="daDealType"/>
-        <result column="da_start_date" property="daStartDate"/>
-        <result column="da_item_name" property="daItemName"/>
-        <result column="da_status" property="daStatus"/>
-        <result column="da_stop_date" property="daStopDate"/>
-        <result column="da_group_no" property="daGroupNo"/>
-        <result column="da_prescription_type" property="daPrescriptionType"/>
-        <result column="medicine_type" property="medicineType"/>
-        <result column="da_med_type" property="daMedType"/>
-        <result column="doctor_notice" property="doctorNotice"/>
-        <result column="doctor_id" property="doctorId"/>
-        <result column="doctor_name" property="doctorName"/>
+        <result column="DOCTOR_ADVICE_ID" property="doctorAdviceId" />
+        <result column="BEHOSPITAL_CODE" property="behospitalCode" />
+        <result column="ORDER_DOCTOR_NAME" property="orderDoctorName" />
+        <result column="FREQUENCY" property="frequency" />
+        <result column="PARENT_TYPE_ID" property="parentTypeId" />
+        <result column="DOCTOR_ADVICE_TYPE" property="doctorAdviceType" />
+        <result column="USAGE_NUM" property="usageNum" />
+        <result column="USAGE_UNIT" property="usageUnit" />
+        <result column="DOSE" property="dose" />
+        <result column="DOSE_UNIT" property="doseUnit" />
+        <result column="MED_MODE_TYPE" property="medModeType" />
+        <result column="DA_FREQUENCY" property="daFrequency" />
+        <result column="DA_DEAL_TYPE" property="daDealType" />
+        <result column="DA_START_DATE" property="daStartDate" />
+        <result column="DA_ITEM_NAME" property="daItemName" />
+        <result column="DA_STATUS" property="daStatus" />
+        <result column="DA_STOP_DATE" property="daStopDate" />
+        <result column="DA_GROUP_NO" property="daGroupNo" />
+        <result column="DA_PRESCRIPTION_TYPE" property="daPrescriptionType" />
+        <result column="MEDICINE_TYPE" property="medicineType" />
+        <result column="DA_MED_TYPE" property="daMedType" />
+        <result column="DOCTOR_NOTICE" property="doctorNotice" />
+        <result column="DOCTOR_ID" property="doctorId" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
+        <result column="DOCTOR_NAME" property="doctorName" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisHomeDiagnoseInfoMapper.xml

@@ -4,15 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomeDiagnoseInfo">
-        <id column="home_page_id" property="homePageId" />
-        <result column="diagnose_order_no" property="diagnoseOrderNo" />
-        <result column="diagnose_type" property="diagnoseType" />
-        <result column="diagnose_type_short" property="diagnoseTypeShort" />
-        <result column="diagnose_name" property="diagnoseName" />
-        <result column="behospital_type" property="behospitalType" />
-        <result column="leave_hospital_type" property="leaveHospitalType" />
-        <result column="pathology_diagnose" property="pathologyDiagnose" />
-        <result column="icd_code" property="icdCode" />
+        <result column="HOME_PAGE_ID" property="homePageId" />
+        <result column="DIAGNOSE_ORDER_NO" property="diagnoseOrderNo" />
+        <result column="DIAGNOSE_TYPE" property="diagnoseType" />
+        <result column="DIAGNOSE_TYPE_SHORT" property="diagnoseTypeShort" />
+        <result column="DIAGNOSE_NAME" property="diagnoseName" />
+        <result column="BEHOSPITAL_TYPE" property="behospitalType" />
+        <result column="LEAVE_HOSPITAL_TYPE" property="leaveHospitalType" />
+        <result column="PATHOLOGY_DIAGNOSE" property="pathologyDiagnose" />
+        <result column="ICD_CODE" property="icdCode" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisHomeOperationInfoMapper.xml

@@ -4,19 +4,21 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomeOperationInfo">
-        <id column="home_page_id" property="homePageId" />
-        <result column="operation_order_no" property="operationOrderNo" />
-        <result column="operation_date" property="operationDate" />
-        <result column="operation_code" property="operationCode" />
-        <result column="operation_doctor_id" property="operationDoctorId" />
-        <result column="first_assistant_id" property="firstAssistantId" />
-        <result column="second_assistant_id" property="secondAssistantId" />
-        <result column="cut_level" property="cutLevel" />
-        <result column="healing_level" property="healingLevel" />
-        <result column="operation_name" property="operationName" />
-        <result column="operation_level" property="operationLevel" />
-        <result column="anaesthesia_name" property="anaesthesiaName" />
-        <result column="sham_operation_name" property="shamOperationName" />
+        <result column="HOME_PAGE_ID" property="homePageId" />
+        <result column="OPERATION_ORDER_NO" property="operationOrderNo" />
+        <result column="OPERATION_DATE" property="operationDate" />
+        <result column="OPERATION_CODE" property="operationCode" />
+        <result column="OPERATION_DOCTOR_ID" property="operationDoctorId" />
+        <result column="FIRST_ASSISTANT_ID" property="firstAssistantId" />
+        <result column="SECOND_ASSISTANT_ID" property="secondAssistantId" />
+        <result column="CUT_LEVEL" property="cutLevel" />
+        <result column="HEALING_LEVEL" property="healingLevel" />
+        <result column="OPERATION_NAME" property="operationName" />
+        <result column="OPERATION_LEVEL" property="operationLevel" />
+        <result column="ANAESTHESIA_NAME" property="anaesthesiaName" />
+        <result column="ANAESTHESIA_DOCTOR" property="anaesthesiaDoctor" />
+        <result column="SHAM_OPERATION_NAME" property="shamOperationName" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisHomePageMapper.xml

@@ -4,146 +4,146 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomePage">
-        <id column="home_page_id" property="homePageId" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="hospital_code" property="hospitalCode" />
-        <result column="hospital_name" property="hospitalName" />
-        <result column="org_code" property="orgCode" />
-        <result column="pay_type" property="payType" />
-        <result column="health_card" property="healthCard" />
-        <result column="behospital_num" property="behospitalNum" />
-        <result column="file_code" property="fileCode" />
-        <result column="name" property="name" />
-        <result column="sex" property="sex" />
-        <result column="birthday" property="birthday" />
-        <result column="age" property="age" />
-        <result column="age_unit" property="ageUnit" />
-        <result column="nationality" property="nationality" />
-        <result column="newborn_month" property="newbornMonth" />
-        <result column="newborn_day" property="newbornDay" />
-        <result column="newborn_weight" property="newbornWeight" />
-        <result column="newborn_behospital_weight" property="newbornBehospitalWeight" />
-        <result column="born_address" property="bornAddress" />
-        <result column="born_place" property="bornPlace" />
-        <result column="nation" property="nation" />
-        <result column="identity_card_no" property="identityCardNo" />
-        <result column="job_type" property="jobType" />
-        <result column="marriage" property="marriage" />
-        <result column="cur_address" property="curAddress" />
-        <result column="cur_phone" property="curPhone" />
-        <result column="cur_post_code" property="curPostCode" />
-        <result column="residence_address" property="residenceAddress" />
-        <result column="residence_post_code" property="residencePostCode" />
-        <result column="work_address" property="workAddress" />
-        <result column="work_phone" property="workPhone" />
-        <result column="work_post_code" property="workPostCode" />
-        <result column="contact_name" property="contactName" />
-        <result column="contact_relation" property="contactRelation" />
-        <result column="contact_address" property="contactAddress" />
-        <result column="contact_phone" property="contactPhone" />
-        <result column="behospital_way" property="behospitalWay" />
-        <result column="behospital_date" property="behospitalDate" />
-        <result column="behospital_dept" property="behospitalDept" />
-        <result column="behospital_ward" property="behospitalWard" />
-        <result column="behospital_bed_id" property="behospitalBedId" />
-        <result column="behospital_bed_code" property="behospitalBedCode" />
-        <result column="change_dept" property="changeDept" />
-        <result column="leave_hospital_date" property="leaveHospitalDate" />
-        <result column="leave_hospital_dept" property="leaveHospitalDept" />
-        <result column="leave_hospital_ward" property="leaveHospitalWard" />
-        <result column="leave_hospital_bed_id" property="leaveHospitalBedId" />
-        <result column="leave_hospital_bed_code" property="leaveHospitalBedCode" />
-        <result column="behospital_day_num" property="behospitalDayNum" />
-        <result column="outpatient_emr_diagnose" property="outpatientEmrDiagnose" />
-        <result column="outpatient_emr_diagnose_code" property="outpatientEmrDiagnoseCode" />
-        <result column="poison_factor" property="poisonFactor" />
-        <result column="poison_factor_code" property="poisonFactorCode" />
-        <result column="pathology_diagnose" property="pathologyDiagnose" />
-        <result column="pathology_diagnose_code" property="pathologyDiagnoseCode" />
-        <result column="pathology_diagnose_id" property="pathologyDiagnoseId" />
-        <result column="is_med_allergy" property="isMedAllergy" />
-        <result column="med_allergy_name" property="medAllergyName" />
-        <result column="autopsy" property="autopsy" />
-        <result column="blood_type" property="bloodType" />
-        <result column="rh" property="rh" />
-        <result column="dept_director" property="deptDirector" />
-        <result column="director_doctor" property="directorDoctor" />
-        <result column="attending_doctor" property="attendingDoctor" />
-        <result column="behospital_doctor" property="behospitalDoctor" />
-        <result column="response_nurse" property="responseNurse" />
-        <result column="study_doctor" property="studyDoctor" />
-        <result column="practice_doctor" property="practiceDoctor" />
-        <result column="encode_man" property="encodeMan" />
-        <result column="home_page_quality" property="homePageQuality" />
-        <result column="qc_doctor" property="qcDoctor" />
-        <result column="qc_nurse" property="qcNurse" />
-        <result column="qc_date" property="qcDate" />
-        <result column="leave_hospital_type" property="leaveHospitalType" />
-        <result column="accept_org_code" property="acceptOrgCode" />
-        <result column="again_behospital_plan" property="againBehospitalPlan" />
-        <result column="again_behospital_goal" property="againBehospitalGoal" />
-        <result column="tbi_before_day" property="tbiBeforeDay" />
-        <result column="tbi_before_hour" property="tbiBeforeHour" />
-        <result column="tbi_before_minute" property="tbiBeforeMinute" />
-        <result column="tbi_after_day" property="tbiAfterDay" />
-        <result column="tbi_after_hour" property="tbiAfterHour" />
-        <result column="tbi_after_minute" property="tbiAfterMinute" />
-        <result column="total_fee" property="totalFee" />
-        <result column="own_fee" property="ownFee" />
-        <result column="general_fee" property="generalFee" />
-        <result column="service_fee" property="serviceFee" />
-        <result column="nurse_fee" property="nurseFee" />
-        <result column="other_fee" property="otherFee" />
-        <result column="pathology_fee" property="pathologyFee" />
-        <result column="lab_fee" property="labFee" />
-        <result column="pacs_fee" property="pacsFee" />
-        <result column="clinic_diagnose_fee" property="clinicDiagnoseFee" />
-        <result column="not_operation_fee" property="notOperationFee" />
-        <result column="clinic_physic_fee" property="clinicPhysicFee" />
-        <result column="operation_treat_fee" property="operationTreatFee" />
-        <result column="anaesthesia_fee" property="anaesthesiaFee" />
-        <result column="operation_fee" property="operationFee" />
-        <result column="health_type_fee" property="healthTypeFee" />
-        <result column="chn_treat_fee" property="chnTreatFee" />
-        <result column="western_med_fee" property="westernMedFee" />
-        <result column="antibiosis_fee" property="antibiosisFee" />
-        <result column="chn_med_fee" property="chnMedFee" />
-        <result column="chn_herb_fee" property="chnHerbFee" />
-        <result column="blood_fee" property="bloodFee" />
-        <result column="albumen_fee" property="albumenFee" />
-        <result column="globulin_fee" property="globulinFee" />
-        <result column="blood_factor_fee" property="bloodFactorFee" />
-        <result column="cell_factor_fee" property="cellFactorFee" />
-        <result column="check_material_fee" property="checkMaterialFee" />
-        <result column="treat_material_fee" property="treatMaterialFee" />
-        <result column="operation_material_fee" property="operationMaterialFee" />
-        <result column="other_type_fee" property="otherTypeFee" />
-        <result column="single_diag_manage" property="singleDiagManage" />
-        <result column="clinic_pathway_manage" property="clinicPathwayManage" />
-        <result column="is_outpatient_behospital" property="isOutpatientBehospital" />
-        <result column="is_leave_behospital" property="isLeaveBehospital" />
-        <result column="is_operation_before_after" property="isOperationBeforeAfter" />
-        <result column="is_clinic_pathology" property="isClinicPathology" />
-        <result column="is_radiate_pathology" property="isRadiatePathology" />
-        <result column="rescue_num" property="rescueNum" />
-        <result column="rescue_success_num" property="rescueSuccessNum" />
-        <result column="is_auto_leavehospital" property="isAutoLeavehospital" />
-        <result column="return_to_type" property="returnToType" />
-        <result column="is_physical_restraint" property="isPhysicalRestraint" />
-        <result column="tbi_behospital_before_time" property="tbiBehospitalBeforeTime" />
-        <result column="tbi_behospital_after_time" property="tbiBehospitalAfterTime" />
-        <result column="is_fall_bed" property="isFallBed" />
-        <result column="is_nosocomial_infection" property="isNosocomialInfection" />
-        <result column="is_into_icu" property="isIntoIcu" />
-        <result column="is_complications" property="isComplications" />
-        <result column="is_pressure_sore" property="isPressureSore" />
-        <result column="is_behospital_pressure_sore" property="isBehospitalPressureSore" />
-        <result column="is_unplanned_reoperation" property="isUnplannedReoperation" />
-        <result column="treatment_results" property="treatmentResults" />
-        <result column="complications_results" property="complicationsResults" />
-        <result column="infection_site" property="infectionSite" />
-        <result column="is_be_in_danger" property="isBeInDanger" />
+        <result column="HOME_PAGE_ID" property="homePageId" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
+        <result column="BEHOSPITAL_CODE" property="behospitalCode" />
+        <result column="HOSPITAL_CODE" property="hospitalCode" />
+        <result column="HOSPITAL_NAME" property="hospitalName" />
+        <result column="ORG_CODE" property="orgCode" />
+        <result column="PAY_TYPE" property="payType" />
+        <result column="HEALTH_CARD" property="healthCard" />
+        <result column="BEHOSPITAL_NUM" property="behospitalNum" />
+        <result column="FILE_CODE" property="fileCode" />
+        <result column="NAME" property="name" />
+        <result column="SEX" property="sex" />
+        <result column="BIRTHDAY" property="birthday" />
+        <result column="AGE" property="age" />
+        <result column="AGE_UNIT" property="ageUnit" />
+        <result column="NATIONALITY" property="nationality" />
+        <result column="NEWBORN_MONTH" property="newbornMonth" />
+        <result column="NEWBORN_DAY" property="newbornDay" />
+        <result column="NEWBORN_WEIGHT" property="newbornWeight" />
+        <result column="NEWBORN_BEHOSPITAL_WEIGHT" property="newbornBehospitalWeight" />
+        <result column="BORN_ADDRESS" property="bornAddress" />
+        <result column="BORN_PLACE" property="bornPlace" />
+        <result column="NATION" property="nation" />
+        <result column="IDENTITY_CARD_NO" property="identityCardNo" />
+        <result column="CUR_POST_CODE" property="curPostCode" />
+        <result column="JOB_TYPE" property="jobType" />
+        <result column="MARRIAGE" property="marriage" />
+        <result column="CUR_ADDRESS" property="curAddress" />
+        <result column="CUR_PHONE" property="curPhone" />
+        <result column="RESIDENCE_ADDRESS" property="residenceAddress" />
+        <result column="RESIDENCE_POST_CODE" property="residencePostCode" />
+        <result column="WORK_ADDRESS" property="workAddress" />
+        <result column="WORK_PHONE" property="workPhone" />
+        <result column="WORK_POST_CODE" property="workPostCode" />
+        <result column="CONTACT_NAME" property="contactName" />
+        <result column="CONTACT_RELATION" property="contactRelation" />
+        <result column="CONTACT_ADDRESS" property="contactAddress" />
+        <result column="CONTACT_PHONE" property="contactPhone" />
+        <result column="BEHOSPITAL_WAY" property="behospitalWay" />
+        <result column="BEHOSPITAL_DATE" property="behospitalDate" />
+        <result column="BEHOSPITAL_DEPT" property="behospitalDept" />
+        <result column="BEHOSPITAL_WARD" property="behospitalWard" />
+        <result column="BEHOSPITAL_BED_ID" property="behospitalBedId" />
+        <result column="BEHOSPITAL_BED_CODE" property="behospitalBedCode" />
+        <result column="CHANGE_DEPT" property="changeDept" />
+        <result column="LEAVE_HOSPITAL_DATE" property="leaveHospitalDate" />
+        <result column="LEAVE_HOSPITAL_DEPT" property="leaveHospitalDept" />
+        <result column="LEAVE_HOSPITAL_WARD" property="leaveHospitalWard" />
+        <result column="LEAVE_HOSPITAL_BED_ID" property="leaveHospitalBedId" />
+        <result column="LEAVE_HOSPITAL_BED_CODE" property="leaveHospitalBedCode" />
+        <result column="BEHOSPITAL_DAY_NUM" property="behospitalDayNum" />
+        <result column="OUTPATIENT_EMR_DIAGNOSE" property="outpatientEmrDiagnose" />
+        <result column="OUTPATIENT_EMR_DIAGNOSE_CODE" property="outpatientEmrDiagnoseCode" />
+        <result column="POISON_FACTOR" property="poisonFactor" />
+        <result column="POISON_FACTOR_CODE" property="poisonFactorCode" />
+        <result column="PATHOLOGY_DIAGNOSE" property="pathologyDiagnose" />
+        <result column="PATHOLOGY_DIAGNOSE_CODE" property="pathologyDiagnoseCode" />
+        <result column="PATHOLOGY_DIAGNOSE_ID" property="pathologyDiagnoseId" />
+        <result column="IS_MED_ALLERGY" property="isMedAllergy" />
+        <result column="MED_ALLERGY_NAME" property="medAllergyName" />
+        <result column="AUTOPSY" property="autopsy" />
+        <result column="BLOOD_TYPE" property="bloodType" />
+        <result column="RH" property="rh" />
+        <result column="DEPT_DIRECTOR" property="deptDirector" />
+        <result column="DIRECTOR_DOCTOR" property="directorDoctor" />
+        <result column="ATTENDING_DOCTOR" property="attendingDoctor" />
+        <result column="BEHOSPITAL_DOCTOR" property="behospitalDoctor" />
+        <result column="RESPONSE_NURSE" property="responseNurse" />
+        <result column="STUDY_DOCTOR" property="studyDoctor" />
+        <result column="PRACTICE_DOCTOR" property="practiceDoctor" />
+        <result column="ENCODE_MAN" property="encodeMan" />
+        <result column="HOME_PAGE_QUALITY" property="homePageQuality" />
+        <result column="QC_DOCTOR" property="qcDoctor" />
+        <result column="QC_NURSE" property="qcNurse" />
+        <result column="QC_DATE" property="qcDate" />
+        <result column="LEAVE_HOSPITAL_TYPE" property="leaveHospitalType" />
+        <result column="ACCEPT_ORG_CODE" property="acceptOrgCode" />
+        <result column="AGAIN_BEHOSPITAL_PLAN" property="againBehospitalPlan" />
+        <result column="AGAIN_BEHOSPITAL_GOAL" property="againBehospitalGoal" />
+        <result column="TBI_BEFORE_DAY" property="tbiBeforeDay" />
+        <result column="TBI_BEFORE_HOUR" property="tbiBeforeHour" />
+        <result column="TBI_BEFORE_MINUTE" property="tbiBeforeMinute" />
+        <result column="TBI_AFTER_DAY" property="tbiAfterDay" />
+        <result column="TBI_AFTER_HOUR" property="tbiAfterHour" />
+        <result column="TBI_AFTER_MINUTE" property="tbiAfterMinute" />
+        <result column="TOTAL_FEE" property="totalFee" />
+        <result column="OWN_FEE" property="ownFee" />
+        <result column="GENERAL_FEE" property="generalFee" />
+        <result column="SERVICE_FEE" property="serviceFee" />
+        <result column="NURSE_FEE" property="nurseFee" />
+        <result column="OTHER_FEE" property="otherFee" />
+        <result column="PATHOLOGY_FEE" property="pathologyFee" />
+        <result column="LAB_FEE" property="labFee" />
+        <result column="PACS_FEE" property="pacsFee" />
+        <result column="CLINIC_DIAGNOSE_FEE" property="clinicDiagnoseFee" />
+        <result column="NOT_OPERATION_FEE" property="notOperationFee" />
+        <result column="CLINIC_PHYSIC_FEE" property="clinicPhysicFee" />
+        <result column="OPERATION_TREAT_FEE" property="operationTreatFee" />
+        <result column="ANAESTHESIA_FEE" property="anaesthesiaFee" />
+        <result column="OPERATION_FEE" property="operationFee" />
+        <result column="HEALTH_TYPE_FEE" property="healthTypeFee" />
+        <result column="CHN_TREAT_FEE" property="chnTreatFee" />
+        <result column="WESTERN_MED_FEE" property="westernMedFee" />
+        <result column="ANTIBIOSIS_FEE" property="antibiosisFee" />
+        <result column="CHN_MED_FEE" property="chnMedFee" />
+        <result column="CHN_HERB_FEE" property="chnHerbFee" />
+        <result column="BLOOD_FEE" property="bloodFee" />
+        <result column="ALBUMEN_FEE" property="albumenFee" />
+        <result column="GLOBULIN_FEE" property="globulinFee" />
+        <result column="BLOOD_FACTOR_FEE" property="bloodFactorFee" />
+        <result column="CELL_FACTOR_FEE" property="cellFactorFee" />
+        <result column="CHECK_MATERIAL_FEE" property="checkMaterialFee" />
+        <result column="TREAT_MATERIAL_FEE" property="treatMaterialFee" />
+        <result column="OPERATION_MATERIAL_FEE" property="operationMaterialFee" />
+        <result column="OTHER_TYPE_FEE" property="otherTypeFee" />
+        <result column="SINGLE_DIAG_MANAGE" property="singleDiagManage" />
+        <result column="CLINIC_PATHWAY_MANAGE" property="clinicPathwayManage" />
+        <result column="IS_OUTPATIENT_BEHOSPITAL" property="isOutpatientBehospital" />
+        <result column="IS_LEAVE_BEHOSPITAL" property="isLeaveBehospital" />
+        <result column="IS_OPERATION_BEFORE_AFTER" property="isOperationBeforeAfter" />
+        <result column="IS_CLINIC_PATHOLOGY" property="isClinicPathology" />
+        <result column="IS_RADIATE_PATHOLOGY" property="isRadiatePathology" />
+        <result column="RESCUE_NUM" property="rescueNum" />
+        <result column="RESCUE_SUCCESS_NUM" property="rescueSuccessNum" />
+        <result column="IS_AUTO_LEAVEHOSPITAL" property="isAutoLeavehospital" />
+        <result column="RETURN_TO_TYPE" property="returnToType" />
+        <result column="IS_PHYSICAL_RESTRAINT" property="isPhysicalRestraint" />
+        <result column="TBI_BEHOSPITAL_BEFORE_TIME" property="tbiBehospitalBeforeTime" />
+        <result column="TBI_BEHOSPITAL_AFTER_TIME" property="tbiBehospitalAfterTime" />
+        <result column="IS_FALL_BED" property="isFallBed" />
+        <result column="IS_NOSOCOMIAL_INFECTION" property="isNosocomialInfection" />
+        <result column="IS_INTO_ICU" property="isIntoIcu" />
+        <result column="IS_COMPLICATIONS" property="isComplications" />
+        <result column="IS_PRESSURE_SORE" property="isPressureSore" />
+        <result column="IS_BEHOSPITAL_PRESSURE_SORE" property="isBehospitalPressureSore" />
+        <result column="IS_UNPLANNED_REOPERATION" property="isUnplannedReoperation" />
+        <result column="TREATMENT_RESULTS" property="treatmentResults" />
+        <result column="COMPLICATIONS_RESULTS" property="complicationsResults" />
+        <result column="INFECTION_SITE" property="infectionSite" />
+        <result column="IS_BE_IN_DANGER" property="isBeInDanger" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisMedicalRecordContentMapper.xml

@@ -4,9 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisMedicalRecordContent">
-        <result column="rec_id" property="recId" />
-        <result column="content_blob" property="contentBlob" typeHandler="org.apache.ibatis.type.BlobTypeHandler"/>
-        <result column="content_text" property="contentText" />
+        <result column="REC_ID" property="recId" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
+        <result column="HTML_TEXT" property="htmlText" />
+        <result column="XML_TEXT" property="xmlText" />
     </resultMap>
 
 </mapper>

src/main/resources/mapper/HisMedicalRecordMapper.xml

@@ -4,11 +4,13 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisMedicalRecord">
-        <id column="rec_id" property="recId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="org_code" property="orgCode" />
-        <result column="rec_date" property="recDate" />
-        <result column="rec_title" property="recTitle" />
+        <result column="REC_ID" property="recId" />
+        <result column="BEHOSPITAL_CODE" property="behospitalCode" />
+        <result column="ORG_CODE" property="orgCode" />
+        <result column="REC_TYPE_ID" property="recTypeId" />
+        <result column="REC_DATE" property="recDate" />
+        <result column="REC_TITLE" property="recTitle" />
+        <result column="HOSPITAL_ID" property="hospitalId" />
     </resultMap>
 
 </mapper>