Sfoglia il codice sorgente

表字段更新,新增his数据模拟相关表

songxinlu 3 anni fa
parent
commit
afe0f43c64
41 ha cambiato i file con 1929 aggiunte e 9 eliminazioni
  1. 8 1
      daqe-center/src/main/java/com/lantone/daqe/entity/BehospitalInfo.java
  2. 218 0
      daqe-center/src/main/java/com/lantone/daqe/entity/HisBehospitalInfo.java
  3. 938 0
      daqe-center/src/main/java/com/lantone/daqe/entity/HisHomePage.java
  4. 101 0
      daqe-center/src/main/java/com/lantone/daqe/entity/HisMedicalRecord.java
  5. 87 0
      daqe-center/src/main/java/com/lantone/daqe/entity/HisMedicalRecordContent.java
  6. 8 1
      daqe-center/src/main/java/com/lantone/daqe/entity/HomePage.java
  7. 8 1
      daqe-center/src/main/java/com/lantone/daqe/entity/MedicalRecord.java
  8. 8 1
      daqe-center/src/main/java/com/lantone/daqe/entity/MedicalRecordContent.java
  9. 1 0
      daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java
  10. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/HisBehospitalInfoFacade.java
  11. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/HisHomePageFacade.java
  12. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/HisMedicalRecordContentFacade.java
  13. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/HisMedicalRecordFacade.java
  14. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/HisBehospitalInfoMapper.java
  15. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/HisHomePageMapper.java
  16. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/HisMedicalRecordContentMapper.java
  17. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/HisMedicalRecordMapper.java
  18. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/HisBehospitalInfoService.java
  19. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/HisHomePageService.java
  20. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/HisMedicalRecordContentService.java
  21. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/HisMedicalRecordService.java
  22. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/HisBehospitalInfoServiceImpl.java
  23. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/HisHomePageServiceImpl.java
  24. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/HisMedicalRecordContentServiceImpl.java
  25. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/HisMedicalRecordServiceImpl.java
  26. 5 0
      daqe-center/src/main/resources/mapper/HisBehospitalInfoMapper.xml
  27. 5 0
      daqe-center/src/main/resources/mapper/HisHomePageMapper.xml
  28. 5 0
      daqe-center/src/main/resources/mapper/HisMedicalRecordContentMapper.xml
  29. 5 0
      daqe-center/src/main/resources/mapper/HisMedicalRecordMapper.xml
  30. 2 1
      daqe-center/src/main/resources/mapper/base/BaseBehospitalInfoMapper.xml
  31. 42 0
      daqe-center/src/main/resources/mapper/base/BaseHisBehospitalInfoMapper.xml
  32. 162 0
      daqe-center/src/main/resources/mapper/base/BaseHisHomePageMapper.xml
  33. 20 0
      daqe-center/src/main/resources/mapper/base/BaseHisMedicalRecordContentMapper.xml
  34. 23 0
      daqe-center/src/main/resources/mapper/base/BaseHisMedicalRecordMapper.xml
  35. 2 1
      daqe-center/src/main/resources/mapper/base/BaseHomePageMapper.xml
  36. 2 1
      daqe-center/src/main/resources/mapper/base/BaseMedicalRecordContentMapper.xml
  37. 2 1
      daqe-center/src/main/resources/mapper/base/BaseMedicalRecordMapper.xml
  38. 5 1
      dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java
  39. 6 0
      security-center/src/main/java/com/lantone/security/entity/Medoup.java
  40. 37 0
      security-center/src/main/java/com/lantone/security/vo/GetMedoupPageVO.java
  41. 1 0
      security-center/src/main/resources/mapper/base/BaseMedoupMapper.xml

+ 8 - 1
daqe-center/src/main/java/com/lantone/daqe/entity/BehospitalInfo.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,10 +20,16 @@ public class BehospitalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /**
      * 病人住院ID
      */
-    @TableId("behospital_code")
+    @TableField("behospital_code")
     private String behospitalCode;
 
     /**

+ 218 - 0
daqe-center/src/main/java/com/lantone/daqe/entity/HisBehospitalInfo.java

@@ -0,0 +1,218 @@
+package com.lantone.daqe.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * his住院病历信息 实体类
+ * </p>
+ */
+@Data
+public class HisBehospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    @TableId("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_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;
+
+    /**
+     * 质控类型
+     */
+    @TableField("qc_type_id")
+    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编码
+     */
+    @TableField("diagnose_icd")
+    private String diagnoseIcd;
+
+    /**
+     * 疾病名称
+     */
+    @TableField("diagnose")
+    private String diagnose;
+
+    /**
+     * 主管医生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;
+
+    /**
+     * 主任医生ID
+     */
+    @TableField("director_doctor_id")
+    private String directorDoctorId;
+
+    /**
+     * 主任医生姓名
+     */
+    @TableField("director_doctor_name")
+    private String directorDoctorName;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    @TableField("is_placefile")
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    @TableField("placefile_date")
+    private Date placefileDate;
+
+    /**
+     * R-住院登记I-病房接诊B-出院登记O-出院结算P-预约出院N-无费退院
+     */
+    @TableField("in_state")
+    private String inState;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

+ 938 - 0
daqe-center/src/main/java/com/lantone/daqe/entity/HisHomePage.java

@@ -0,0 +1,938 @@
+package com.lantone.daqe.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *  实体类
+ * </p>
+ */
+@Data
+public class HisHomePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病案首页编号
+     */
+    @TableId("home_page_id")
+    private String homePageId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 组织机构id
+     */
+    @TableField("hospital_code")
+    private String hospitalCode;
+
+    /**
+     * 医疗机构名称
+     */
+    @TableField("hospital_name")
+    private String hospitalName;
+
+    /**
+     * 医疗机构代码
+     */
+    @TableField("org_code")
+    private String orgCode;
+
+    /**
+     * 医疗付费方式
+     */
+    @TableField("pay_type")
+    private String payType;
+
+    /**
+     * 健康卡号
+     */
+    @TableField("health_card")
+    private String healthCard;
+
+    /**
+     * 住院次数
+     */
+    @TableField("behospital_num")
+    private String behospitalNum;
+
+    /**
+     * 病案号
+     */
+    @TableField("file_code")
+    private String fileCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    @TableField("birthday")
+    private Date birthday;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 年龄单位
+     */
+    @TableField("age_unit")
+    private String ageUnit;
+
+    /**
+     * 国籍
+     */
+    @TableField("nationality")
+    private String nationality;
+
+    /**
+     * 新生儿出生月数
+     */
+    @TableField("newborn_month")
+    private String newbornMonth;
+
+    /**
+     * 新生儿出生天数
+     */
+    @TableField("newborn_day")
+    private String newbornDay;
+
+    /**
+     * 新生儿出生体重
+     */
+    @TableField("newborn_weight")
+    private String newbornWeight;
+
+    /**
+     * 新生儿入院体重
+     */
+    @TableField("newborn_behospital_weight")
+    private String newbornBehospitalWeight;
+
+    /**
+     * 出生地
+     */
+    @TableField("born_address")
+    private String bornAddress;
+
+    /**
+     * 籍贯
+     */
+    @TableField("born_place")
+    private String bornPlace;
+
+    /**
+     * 民族
+     */
+    @TableField("nation")
+    private String nation;
+
+    /**
+     * 身份证号
+     */
+    @TableField("identity_card_no")
+    private String identityCardNo;
+
+    /**
+     * 职业
+     */
+    @TableField("job_type")
+    private String jobType;
+
+    /**
+     * 婚姻
+     */
+    @TableField("marriage")
+    private String marriage;
+
+    /**
+     * 现住址
+     */
+    @TableField("cur_address")
+    private String curAddress;
+
+    /**
+     * 现住址电话
+     */
+    @TableField("cur_phone")
+    private String curPhone;
+
+    /**
+     * 现住址邮编
+     */
+    @TableField("cur_post_code")
+    private String curPostCode;
+
+    /**
+     * 户口地址
+     */
+    @TableField("residence_address")
+    private String residenceAddress;
+
+    /**
+     * 户口地址邮编
+     */
+    @TableField("residence_post_code")
+    private String residencePostCode;
+
+    /**
+     * 工作单位
+     */
+    @TableField("work_address")
+    private String workAddress;
+
+    /**
+     * 工作单位电话
+     */
+    @TableField("work_phone")
+    private String workPhone;
+
+    /**
+     * 工作单位邮编
+     */
+    @TableField("work_post_code")
+    private String workPostCode;
+
+    /**
+     * 联系人姓名
+     */
+    @TableField("contact_name")
+    private String contactName;
+
+    /**
+     * 联系人关系
+     */
+    @TableField("contact_relation")
+    private String contactRelation;
+
+    /**
+     * 联系人地址
+     */
+    @TableField("contact_address")
+    private String contactAddress;
+
+    /**
+     * 联系人电话
+     */
+    @TableField("contact_phone")
+    private String contactPhone;
+
+    /**
+     * 入院途径
+     */
+    @TableField("behospital_way")
+    private String behospitalWay;
+
+    /**
+     * 入院时间
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 入院科别
+     */
+    @TableField("behospital_dept")
+    private String behospitalDept;
+
+    /**
+     * 入院病房
+     */
+    @TableField("behospital_ward")
+    private String behospitalWard;
+
+    /**
+     * 入院床位序号
+     */
+    @TableField("behospital_bed_id")
+    private String behospitalBedId;
+
+    /**
+     * 入院床位号码
+     */
+    @TableField("behospital_bed_code")
+    private String behospitalBedCode;
+
+    /**
+     * 转科科别
+     */
+    @TableField("change_dept")
+    private String changeDept;
+
+    /**
+     * 出院时间
+     */
+    @TableField("leave_hospital_date")
+    private Date leaveHospitalDate;
+
+    /**
+     * 出院科别
+     */
+    @TableField("leave_hospital_dept")
+    private String leaveHospitalDept;
+
+    /**
+     * 出院病房
+     */
+    @TableField("leave_hospital_ward")
+    private String leaveHospitalWard;
+
+    /**
+     * 出院床位序号
+     */
+    @TableField("leave_hospital_bed_id")
+    private String leaveHospitalBedId;
+
+    /**
+     * 出院床位号码
+     */
+    @TableField("leave_hospital_bed_code")
+    private String leaveHospitalBedCode;
+
+    /**
+     * 实际住院天数
+     */
+    @TableField("behospital_day_num")
+    private String behospitalDayNum;
+
+    /**
+     * 治疗类别(1.中医<1.1 中医;1.2 民族医>、2.中西医、3.西医 )
+     */
+    @TableField("treatment_type")
+    private String treatmentType;
+
+    /**
+     * 门急诊诊断
+     */
+    @TableField("outpatient_emr_diagnose")
+    private String outpatientEmrDiagnose;
+
+    /**
+     * 门急诊诊断(中医)
+     */
+    @TableField("outpatient_emr_ch_diagnose")
+    private String outpatientEmrChDiagnose;
+
+    /**
+     * 门急诊诊断编码
+     */
+    @TableField("outpatient_emr_diagnose_code")
+    private String outpatientEmrDiagnoseCode;
+
+    /**
+     * 门急诊诊断编码(中医)
+     */
+    @TableField("outpatient_emr_ch_diagnose_code")
+    private String outpatientEmrChDiagnoseCode;
+
+    /**
+     * 实施临床路径(1中医、2西医、3否)
+     */
+    @TableField("implementation_clinical_pathway")
+    private String implementationClinicalPathway;
+
+    /**
+     * 使用医疗机构中药制剂(1是、2否)
+     */
+    @TableField("is_chinese_medicine_preparation")
+    private String isChineseMedicinePreparation;
+
+    /**
+     * 使用中医诊疗设备(1是、2否)	
+     */
+    @TableField("is_chinese_diagnose_equipment")
+    private String isChineseDiagnoseEquipment;
+
+    /**
+     * 使用中医诊疗技术(1是 、2否)	
+     */
+    @TableField("is_chinese_diagnose_technology")
+    private String isChineseDiagnoseTechnology;
+
+    /**
+     * 辩证施护(1是、2否)
+     */
+    @TableField("dialectical_nursing")
+    private String dialecticalNursing;
+
+    /**
+     * 损伤中毒因素
+     */
+    @TableField("poison_factor")
+    private String poisonFactor;
+
+    /**
+     * 损伤中毒因素编码
+     */
+    @TableField("poison_factor_code")
+    private String poisonFactorCode;
+
+    /**
+     * 病理诊断
+     */
+    @TableField("pathology_diagnose")
+    private String pathologyDiagnose;
+
+    /**
+     * 病理诊断编码
+     */
+    @TableField("pathology_diagnose_code")
+    private String pathologyDiagnoseCode;
+
+    /**
+     * 病理诊断编号
+     */
+    @TableField("pathology_diagnose_id")
+    private String pathologyDiagnoseId;
+
+    /**
+     * 药物过敏
+     */
+    @TableField("is_med_allergy")
+    private String isMedAllergy;
+
+    /**
+     * 过敏药物
+     */
+    @TableField("med_allergy_name")
+    private String medAllergyName;
+
+    /**
+     * 死亡患者尸检
+     */
+    @TableField("autopsy")
+    private String autopsy;
+
+    /**
+     * 血型
+     */
+    @TableField("blood_type")
+    private String bloodType;
+
+    /**
+     * Rh
+     */
+    @TableField("rh")
+    private String rh;
+
+    /**
+     * 科主任
+     */
+    @TableField("dept_director")
+    private String deptDirector;
+
+    /**
+     * 主任医师
+     */
+    @TableField("director_doctor")
+    private String directorDoctor;
+
+    /**
+     * 主治医师
+     */
+    @TableField("attending_doctor")
+    private String attendingDoctor;
+
+    /**
+     * 住院医师
+     */
+    @TableField("behospital_doctor")
+    private String behospitalDoctor;
+
+    /**
+     * 责任护士
+     */
+    @TableField("response_nurse")
+    private String responseNurse;
+
+    /**
+     * 进修医师
+     */
+    @TableField("study_doctor")
+    private String studyDoctor;
+
+    /**
+     * 实习医师
+     */
+    @TableField("practice_doctor")
+    private String practiceDoctor;
+
+    /**
+     * 编码员
+     */
+    @TableField("encode_man")
+    private String encodeMan;
+
+    /**
+     * 病案质量
+     */
+    @TableField("home_page_quality")
+    private String homePageQuality;
+
+    /**
+     * 质控医师
+     */
+    @TableField("qc_doctor")
+    private String qcDoctor;
+
+    /**
+     * 质控护士
+     */
+    @TableField("qc_nurse")
+    private String qcNurse;
+
+    /**
+     * 质控日期
+     */
+    @TableField("qc_date")
+    private Date qcDate;
+
+    /**
+     * 离院方式
+     */
+    @TableField("leave_hospital_type")
+    private String leaveHospitalType;
+
+    /**
+     * 接收机构名称
+     */
+    @TableField("accept_org_code")
+    private String acceptOrgCode;
+
+    /**
+     * 31天内再住院计划
+     */
+    @TableField("again_behospital_plan")
+    private String againBehospitalPlan;
+
+    /**
+     * 再住院目的
+     */
+    @TableField("again_behospital_goal")
+    private String againBehospitalGoal;
+
+    /**
+     * 颅脑损伤患者昏迷前天数
+     */
+    @TableField("tbi_before_day")
+    private String tbiBeforeDay;
+
+    /**
+     * 颅脑损伤患者昏迷前小时
+     */
+    @TableField("tbi_before_hour")
+    private String tbiBeforeHour;
+
+    /**
+     * 颅脑损伤患者昏迷前分钟
+     */
+    @TableField("tbi_before_minute")
+    private String tbiBeforeMinute;
+
+    /**
+     * 颅脑损伤患者昏迷后天数
+     */
+    @TableField("tbi_after_day")
+    private String tbiAfterDay;
+
+    /**
+     * 颅脑损伤患者昏迷后小时
+     */
+    @TableField("tbi_after_hour")
+    private String tbiAfterHour;
+
+    /**
+     * 颅脑损伤患者昏迷后分钟
+     */
+    @TableField("tbi_after_minute")
+    private String tbiAfterMinute;
+
+    /**
+     * 总费用
+     */
+    @TableField("total_fee")
+    private String totalFee;
+
+    /**
+     * 自付金额
+     */
+    @TableField("own_fee")
+    private String ownFee;
+
+    /**
+     * 一般医疗服务费
+     */
+    @TableField("general_fee")
+    private String generalFee;
+
+    /**
+     * 一般治疗服务费
+     */
+    @TableField("service_fee")
+    private String serviceFee;
+
+    /**
+     * 护理费
+     */
+    @TableField("nurse_fee")
+    private String nurseFee;
+
+    /**
+     * 其他费用
+     */
+    @TableField("other_fee")
+    private String otherFee;
+
+    /**
+     * 病理诊断费
+     */
+    @TableField("pathology_fee")
+    private String pathologyFee;
+
+    /**
+     * 实验室诊断费
+     */
+    @TableField("lab_fee")
+    private String labFee;
+
+    /**
+     * 影像学诊断费
+     */
+    @TableField("pacs_fee")
+    private String pacsFee;
+
+    /**
+     * 临床诊断项目费
+     */
+    @TableField("clinic_diagnose_fee")
+    private String clinicDiagnoseFee;
+
+    /**
+     * 非手术治疗项目费
+     */
+    @TableField("not_operation_fee")
+    private String notOperationFee;
+
+    /**
+     * 临床物理治疗费
+     */
+    @TableField("clinic_physic_fee")
+    private String clinicPhysicFee;
+
+    /**
+     * 手术治疗费
+     */
+    @TableField("operation_treat_fee")
+    private String operationTreatFee;
+
+    /**
+     * 麻醉费
+     */
+    @TableField("anaesthesia_fee")
+    private String anaesthesiaFee;
+
+    /**
+     * 手术费
+     */
+    @TableField("operation_fee")
+    private String operationFee;
+
+    /**
+     * 康复类
+     */
+    @TableField("health_type_fee")
+    private String healthTypeFee;
+
+    /**
+     * 中医治疗费
+     */
+    @TableField("chn_treat_fee")
+    private String chnTreatFee;
+
+    /**
+     * 西药费
+     */
+    @TableField("western_med_fee")
+    private String westernMedFee;
+
+    /**
+     * 抗菌药物费用
+     */
+    @TableField("antibiosis_fee")
+    private String antibiosisFee;
+
+    /**
+     * 中成药费
+     */
+    @TableField("chn_med_fee")
+    private String chnMedFee;
+
+    /**
+     * 中草药费
+     */
+    @TableField("chn_herb_fee")
+    private String chnHerbFee;
+
+    /**
+     * 血费
+     */
+    @TableField("blood_fee")
+    private String bloodFee;
+
+    /**
+     * 白蛋白类制品费
+     */
+    @TableField("albumen_fee")
+    private String albumenFee;
+
+    /**
+     * 球蛋白类制品费
+     */
+    @TableField("globulin_fee")
+    private String globulinFee;
+
+    /**
+     * 凝血因子类制品费
+     */
+    @TableField("blood_factor_fee")
+    private String bloodFactorFee;
+
+    /**
+     * 细胞因子类制品费
+     */
+    @TableField("cell_factor_fee")
+    private String cellFactorFee;
+
+    /**
+     * 检查用一次性医用材料费
+     */
+    @TableField("check_material_fee")
+    private String checkMaterialFee;
+
+    /**
+     * 治疗用一次性医用材料费
+     */
+    @TableField("treat_material_fee")
+    private String treatMaterialFee;
+
+    /**
+     * 手术用一次性医用材料费
+     */
+    @TableField("operation_material_fee")
+    private String operationMaterialFee;
+
+    /**
+     * 其他类其他费
+     */
+    @TableField("other_type_fee")
+    private String otherTypeFee;
+
+    /**
+     * 单病种管理
+     */
+    @TableField("single_diag_manage")
+    private String singleDiagManage;
+
+    /**
+     * 临床路径管理
+     */
+    @TableField("clinic_pathway_manage")
+    private String clinicPathwayManage;
+
+    /**
+     * 门诊与住院
+     */
+    @TableField("is_outpatient_behospital")
+    private String isOutpatientBehospital;
+
+    /**
+     * 入院与出院
+     */
+    @TableField("is_leave_behospital")
+    private String isLeaveBehospital;
+
+    /**
+     * 术前与术后
+     */
+    @TableField("is_operation_before_after")
+    private String isOperationBeforeAfter;
+
+    /**
+     * 临床与病理
+     */
+    @TableField("is_clinic_pathology")
+    private String isClinicPathology;
+
+    /**
+     * 放射与病理
+     */
+    @TableField("is_radiate_pathology")
+    private String isRadiatePathology;
+
+    /**
+     * 病人抢救次数
+     */
+    @TableField("rescue_num")
+    private String rescueNum;
+
+    /**
+     * 病人抢救成功次数
+     */
+    @TableField("rescue_success_num")
+    private String rescueSuccessNum;
+
+    /**
+     * 是否为自动出院
+     */
+    @TableField("is_auto_leavehospital")
+    private String isAutoLeavehospital;
+
+    /**
+     * 转归情况
+     */
+    @TableField("return_to_type")
+    private String returnToType;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 住院期间身体约束
+     */
+    @TableField("is_physical_restraint")
+    private String isPhysicalRestraint;
+
+    /**
+     * 入院前颅脑损伤患者昏迷时间
+     */
+    @TableField("tbi_behospital_before_time")
+    private String tbiBehospitalBeforeTime;
+
+    /**
+     * 入院后颅脑损伤患者昏迷时间
+     */
+    @TableField("tbi_behospital_after_time")
+    private String tbiBehospitalAfterTime;
+
+    /**
+     * 住院期间是否发生跌倒或坠床
+     */
+    @TableField("is_fall_bed")
+    private String isFallBed;
+
+    /**
+     * 医院感染
+     */
+    @TableField("is_nosocomial_infection")
+    private String isNosocomialInfection;
+
+    /**
+     * 入住ICU情况
+     */
+    @TableField("is_into_icu")
+    private String isIntoIcu;
+
+    /**
+     * 并发症情况
+     */
+    @TableField("is_complications")
+    private String isComplications;
+
+    /**
+     * 是否发生压疮
+     */
+    @TableField("is_pressure_sore")
+    private String isPressureSore;
+
+    /**
+     * 是否住院期间发生压疮
+     */
+    @TableField("is_behospital_pressure_sore")
+    private String isBehospitalPressureSore;
+
+    /**
+     * 非计划再次手术
+     */
+    @TableField("is_unplanned_reoperation")
+    private String isUnplannedReoperation;
+
+    /**
+     * 治疗结果
+     */
+    @TableField("treatment_results")
+    private String treatmentResults;
+
+    /**
+     * 并发症
+     */
+    @TableField("complications_results")
+    private String complicationsResults;
+
+    /**
+     * 感染部位
+     */
+    @TableField("infection_site")
+    private String infectionSite;
+
+    /**
+     * 住院期间有无告病危
+     */
+    @TableField("is_be_in_danger")
+    private String isBeInDanger;
+
+}

+ 101 - 0
daqe-center/src/main/java/com/lantone/daqe/entity/HisMedicalRecord.java

@@ -0,0 +1,101 @@
+package com.lantone.daqe.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *  实体类
+ * </p>
+ */
+@Data
+public class HisMedicalRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 组织机构代码
+     */
+    @TableField("org_code")
+    private String orgCode;
+
+    /**
+     * 病历类别编号
+     */
+    @TableField("rec_type_id")
+    private String recTypeId;
+
+    /**
+     * 模块id
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 病历日期
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 病历标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 模板处理状态(0:未处理,1:已处理)
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

+ 87 - 0
daqe-center/src/main/java/com/lantone/daqe/entity/HisMedicalRecordContent.java

@@ -0,0 +1,87 @@
+package com.lantone.daqe.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Blob;
+import java.util.Date;
+
+/**
+ * <p>
+ *  实体类
+ * </p>
+ */
+@Data
+public class HisMedicalRecordContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 文书内容(blob)
+     */
+    @TableField("content_blob")
+    private Blob contentBlob;
+
+    /**
+     * 病历文本(文本)
+     */
+    @TableField("content_text")
+    private String contentText;
+
+    /**
+     * html文本信息
+     */
+    @TableField("html_text")
+    private String htmlText;
+
+    /**
+     * xml文本信息
+     */
+    @TableField("xml_text")
+    private String xmlText;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

+ 8 - 1
daqe-center/src/main/java/com/lantone/daqe/entity/HomePage.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,10 +20,16 @@ public class HomePage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /**
      * 病案首页编号
      */
-    @TableId("home_page_id")
+    @TableField("home_page_id")
     private String homePageId;
 
     /**

+ 8 - 1
daqe-center/src/main/java/com/lantone/daqe/entity/MedicalRecord.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -19,7 +20,13 @@ public class MedicalRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("rec_id")
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("rec_id")
     private String recId;
 
     /**

+ 8 - 1
daqe-center/src/main/java/com/lantone/daqe/entity/MedicalRecordContent.java

@@ -1,5 +1,6 @@
 package com.lantone.daqe.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,10 +21,16 @@ public class MedicalRecordContent implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     /**
      * 病历ID
      */
-    @TableId("rec_id")
+    @TableField("rec_id")
     private String recId;
 
     /**

+ 1 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/BlockLossManagementFacade.java

@@ -525,6 +525,7 @@ public class BlockLossManagementFacade {
      * @Return java.util.List<com.lantone.daqe.dto.HisMedicalRecordDTO>
      */
     private List<HisMedicalRecordDTO> getHisMedicalRecords(DataCompareVO dataCompareVO) {
+        //技术服务部接口 /balance/data/getDataCount
         //###模拟
 
         return new ArrayList<>();

+ 14 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/HisBehospitalInfoFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.HisBehospitalInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:his_behospital_info 业务类
+ * </p>
+ */
+@Component
+public class HisBehospitalInfoFacade extends HisBehospitalInfoServiceImpl {
+
+}

+ 14 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/HisHomePageFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.HisHomePageServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:his_home_page 业务类
+ * </p>
+ */
+@Component
+public class HisHomePageFacade extends HisHomePageServiceImpl {
+
+}

+ 14 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/HisMedicalRecordContentFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.HisMedicalRecordContentServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:his_medical_record_content 业务类
+ * </p>
+ */
+@Component
+public class HisMedicalRecordContentFacade extends HisMedicalRecordContentServiceImpl {
+
+}

+ 14 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/base/HisMedicalRecordFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.HisMedicalRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:his_medical_record 业务类
+ * </p>
+ */
+@Component
+public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/HisBehospitalInfoMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.HisBehospitalInfo;
+
+/**
+ * <p>
+ * 表名:his_behospital_info Mapper接口
+ * </p>
+ */
+public interface HisBehospitalInfoMapper extends BaseMapper<HisBehospitalInfo> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/HisHomePageMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.HisHomePage;
+
+/**
+ * <p>
+ * 表名:his_home_page Mapper接口
+ * </p>
+ */
+public interface HisHomePageMapper extends BaseMapper<HisHomePage> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/HisMedicalRecordContentMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.HisMedicalRecordContent;
+
+/**
+ * <p>
+ * 表名:his_medical_record_content Mapper接口
+ * </p>
+ */
+public interface HisMedicalRecordContentMapper extends BaseMapper<HisMedicalRecordContent> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/HisMedicalRecordMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.HisMedicalRecord;
+
+/**
+ * <p>
+ * 表名:his_medical_record Mapper接口
+ * </p>
+ */
+public interface HisMedicalRecordMapper extends BaseMapper<HisMedicalRecord> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/service/HisBehospitalInfoService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.HisBehospitalInfo;
+
+/**
+ * <p>
+ * his住院病历信息 Service类
+ * </p>
+ */
+public interface HisBehospitalInfoService extends IService<HisBehospitalInfo> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/service/HisHomePageService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.HisHomePage;
+
+/**
+ * <p>
+ *  Service类
+ * </p>
+ */
+public interface HisHomePageService extends IService<HisHomePage> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/service/HisMedicalRecordContentService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.HisMedicalRecordContent;
+
+/**
+ * <p>
+ *  Service类
+ * </p>
+ */
+public interface HisMedicalRecordContentService extends IService<HisMedicalRecordContent> {
+
+}

+ 13 - 0
daqe-center/src/main/java/com/lantone/daqe/service/HisMedicalRecordService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.HisMedicalRecord;
+
+/**
+ * <p>
+ *  Service类
+ * </p>
+ */
+public interface HisMedicalRecordService extends IService<HisMedicalRecord> {
+
+}

+ 17 - 0
daqe-center/src/main/java/com/lantone/daqe/service/impl/HisBehospitalInfoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.HisBehospitalInfo;
+import com.lantone.daqe.mapper.HisBehospitalInfoMapper;
+import com.lantone.daqe.service.HisBehospitalInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * his住院病历信息 Service实现类
+ * </p>
+ */
+@Service
+public class HisBehospitalInfoServiceImpl extends ServiceImpl<HisBehospitalInfoMapper, HisBehospitalInfo> implements HisBehospitalInfoService {
+
+}

+ 17 - 0
daqe-center/src/main/java/com/lantone/daqe/service/impl/HisHomePageServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.HisHomePage;
+import com.lantone.daqe.mapper.HisHomePageMapper;
+import com.lantone.daqe.service.HisHomePageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  Service实现类
+ * </p>
+ */
+@Service
+public class HisHomePageServiceImpl extends ServiceImpl<HisHomePageMapper, HisHomePage> implements HisHomePageService {
+
+}

+ 17 - 0
daqe-center/src/main/java/com/lantone/daqe/service/impl/HisMedicalRecordContentServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.HisMedicalRecordContent;
+import com.lantone.daqe.mapper.HisMedicalRecordContentMapper;
+import com.lantone.daqe.service.HisMedicalRecordContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  Service实现类
+ * </p>
+ */
+@Service
+public class HisMedicalRecordContentServiceImpl extends ServiceImpl<HisMedicalRecordContentMapper, HisMedicalRecordContent> implements HisMedicalRecordContentService {
+
+}

+ 17 - 0
daqe-center/src/main/java/com/lantone/daqe/service/impl/HisMedicalRecordServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.HisMedicalRecord;
+import com.lantone.daqe.mapper.HisMedicalRecordMapper;
+import com.lantone.daqe.service.HisMedicalRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  Service实现类
+ * </p>
+ */
+@Service
+public class HisMedicalRecordServiceImpl extends ServiceImpl<HisMedicalRecordMapper, HisMedicalRecord> implements HisMedicalRecordService {
+
+}

+ 5 - 0
daqe-center/src/main/resources/mapper/HisBehospitalInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisBehospitalInfoMapper">
+
+</mapper>

+ 5 - 0
daqe-center/src/main/resources/mapper/HisHomePageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisHomePageMapper">
+
+</mapper>

+ 5 - 0
daqe-center/src/main/resources/mapper/HisMedicalRecordContentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisMedicalRecordContentMapper">
+
+</mapper>

+ 5 - 0
daqe-center/src/main/resources/mapper/HisMedicalRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisMedicalRecordMapper">
+
+</mapper>

+ 2 - 1
daqe-center/src/main/resources/mapper/base/BaseBehospitalInfoMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.BehospitalInfo">
-        <id column="behospital_code" property="behospitalCode"/>
+        <id column="id" property="id"/>
+        <result column="behospital_code" property="behospitalCode"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="name" property="name"/>
         <result column="sex" property="sex"/>

+ 42 - 0
daqe-center/src/main/resources/mapper/base/BaseHisBehospitalInfoMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisBehospitalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.HisBehospitalInfo">
+        <id column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="name" property="name"/>
+        <result column="sex" property="sex"/>
+        <result column="birthday" property="birthday"/>
+        <result column="file_code" property="fileCode"/>
+        <result column="qc_type_id" property="qcTypeId"/>
+        <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="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="is_placefile" property="isPlacefile"/>
+        <result column="placefile_date" property="placefileDate"/>
+        <result column="in_state" property="inState"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+    </resultMap>
+
+</mapper>

+ 162 - 0
daqe-center/src/main/resources/mapper/base/BaseHisHomePageMapper.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisHomePageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.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="treatment_type" property="treatmentType"/>
+        <result column="outpatient_emr_diagnose" property="outpatientEmrDiagnose"/>
+        <result column="outpatient_emr_ch_diagnose" property="outpatientEmrChDiagnose"/>
+        <result column="outpatient_emr_diagnose_code" property="outpatientEmrDiagnoseCode"/>
+        <result column="outpatient_emr_ch_diagnose_code" property="outpatientEmrChDiagnoseCode"/>
+        <result column="implementation_clinical_pathway" property="implementationClinicalPathway"/>
+        <result column="is_chinese_medicine_preparation" property="isChineseMedicinePreparation"/>
+        <result column="is_chinese_diagnose_equipment" property="isChineseDiagnoseEquipment"/>
+        <result column="is_chinese_diagnose_technology" property="isChineseDiagnoseTechnology"/>
+        <result column="dialectical_nursing" property="dialecticalNursing"/>
+        <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_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <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>

+ 20 - 0
daqe-center/src/main/resources/mapper/base/BaseHisMedicalRecordContentMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisMedicalRecordContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.HisMedicalRecordContent">
+        <id column="rec_id" property="recId"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="content_blob" property="contentBlob"/>
+        <result column="content_text" property="contentText"/>
+        <result column="html_text" property="htmlText"/>
+        <result column="xml_text" property="xmlText"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+    </resultMap>
+
+</mapper>

+ 23 - 0
daqe-center/src/main/resources/mapper/base/BaseHisMedicalRecordMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.HisMedicalRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.HisMedicalRecord">
+        <id column="rec_id" property="recId"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="org_code" property="orgCode"/>
+        <result column="rec_type_id" property="recTypeId"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="rec_date" property="recDate"/>
+        <result column="rec_title" property="recTitle"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+    </resultMap>
+
+</mapper>

+ 2 - 1
daqe-center/src/main/resources/mapper/base/BaseHomePageMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.HomePage">
-        <id column="home_page_id" property="homePageId"/>
+        <id column="id" property="id"/>
+        <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"/>

+ 2 - 1
daqe-center/src/main/resources/mapper/base/BaseMedicalRecordContentMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.MedicalRecordContent">
-        <id column="rec_id" property="recId"/>
+        <id column="id" property="id"/>
+        <result column="rec_id" property="recId"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="content_blob" property="contentBlob" typeHandler="org.apache.ibatis.type.BlobTypeHandler"/>
         <result column="content_text" property="contentText"/>

+ 2 - 1
daqe-center/src/main/resources/mapper/base/BaseMedicalRecordMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.MedicalRecord">
-        <id column="rec_id" property="recId"/>
+        <id column="id" property="id"/>
+        <result column="rec_id" property="recId"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="behospital_code" property="behospitalCode"/>
         <result column="org_code" property="orgCode"/>

+ 5 - 1
dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -118,7 +118,11 @@ public class CodeAutoGenerator {
                 "med_behospital_info",
                 "med_home_page",
                 "med_medical_record",
-                "med_medical_record_content"
+                "med_medical_record_content",
+                "his_behospital_info",
+                "his_home_page",
+                "his_medical_record",
+                "his_medical_record_content"
         };
         //生成的实体类忽略表前缀: 不需要则置空
         String[] ENTITY_IGNORE_PREFIX = { "hos_", "dc_", "med_" };

+ 6 - 0
security-center/src/main/java/com/lantone/security/entity/Medoup.java

@@ -38,6 +38,12 @@ public class Medoup implements Serializable {
     @TableField("name")
     private String name;
 
+    /**
+     * 状态 0:禁用,1:启用
+     */
+    @TableField("status")
+    private String status;
+
     /**
      * 是否删除,N:未删除,Y:删除
      */

+ 37 - 0
security-center/src/main/java/com/lantone/security/vo/GetMedoupPageVO.java

@@ -0,0 +1,37 @@
+package com.lantone.security.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * @Description: 医疗组目录列表-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "医疗组目录列表-接口入参")
+@Getter
+@Setter
+public class GetMedoupPageVO implements Serializable {
+
+    private static final long serialVersionUID = 2910025758966361980L;
+
+    @ApiModelProperty(value = "医疗组ID")
+    @NotBlank(message = "医疗组ID不能为空")
+    @Size(min = 0, max = 30, message = ("医疗组ID长度1-30"))
+    private Long id;
+
+    @ApiModelProperty(value = "正则式值", required = true)
+    @NotBlank(message = "正则式值不能为空")
+    private String val;
+
+    @ApiModelProperty(value = "描述")
+    @Size(min = 0, max = 200, message = ("说明长度1-30"))
+    private String description;
+
+}

+ 1 - 0
security-center/src/main/resources/mapper/base/BaseMedoupMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
+        <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>