Merge remote-tracking branch 'origin/dev/20210916-report' into dev/ez-analyze210917

# Conflicts:
#	common/src/main/java/com/lantone/common/util/BeanUtil.java
#	dblayer-mbg/src/main/resources/application.yml

common/src/main/java/com/lantone/common/constant/QualityContent.java

@@ -0,0 +1,172 @@
+package com.lantone.common.constant;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 新指标常用常量
+ */
+public class QualityContent {
+    public static final String recordNumber = "关联首页表质控病历人数";
+    public static final String NoRecordNumberId = "无病案首页病历ID";
+    public static final String DISCHARGED_PATIENTS = "出院人数";
+    public static final String NUMBER_OF_HOSPITAL = "入院人数";
+    public static final String NO_RECORD_OPERATION = "无病案首页手术患者";
+    public static final String NO_RECORD_OPERATION_PATHOLOGY = "无病案首页手术病理患者";
+    public static final double pathologyFee = 68.00;
+    /**
+     * 是否需要用到医嘱的指标名称
+     */
+    public static List<String> NO_MEDICAL_ADVICE = Arrays.asList("",
+            "入院记录24小时内完成率","出院记录24小时内完成率","病案首页24小时内完成率"
+    );
+    public static List<String> NEED_MEDICAL_ADVICE = Arrays.asList("",
+            "手术记录24小时内完成率","手术相关记录完成率","患者抢救记录及时完成率","临床用血相关记录符合率","CT检查记录符合率","MRI检查记录符合率","病理检查记录符合率","抗菌药物使用记录符合率","恶性肿瘤化学治疗记录符合率"
+    );
+    /**
+     * 关联首页无code需要去医嘱查询指标
+     */
+    public static List<String> NORecord_NEED_MEDICAL_ADVICE = Arrays.asList("",
+            "手术记录24小时内完成率","病理检查记录符合率","抗菌药物使用记录符合率"
+    );
+    /**
+     * 所有指标名称
+     */
+
+    public static final String QB = "";
+    public static final String ZYBA_CYHZ = "住院病案管理人员月均负担出院患者病历数";
+    public static final String BABM_CYHZ = "病案编码人员月均负担出院患者病历数";
+    public static final String MZBA_CYHZ = "门诊病案管理人员月均负担门诊患者病历数";
+    public static final String RYJL_24H_WCL = "入院记录24小时内完成率";
+    public static final String CYJL_24H_WCL = "出院记录24小时内完成率";
+    public static final String BASY_24H_WCL = "病案首页24小时内完成率";
+    public static final String SSJL_24H_WCL = "手术记录24小时内完成率";
+    public static final String CT_JCJL_FHL = "CT检查记录符合率";
+    public static final String MR_JCJL_FHL = "MRI检查记录符合率";
+    public static final String BL_JCJL_FHL = "病理检查记录符合率";
+    public static final String XJPY_JCJL_FHL = "细菌培养检查记录符合率";
+    public static final String KJYW_SY_FHL = "抗菌药物使用记录符合率";
+    public static final String EXZL_HXZL_FHL = "恶性肿瘤化学治疗记录符合率";
+    public static final String EXZL_FSZL_FHL = "恶性肿瘤放射治疗记录符合率";
+    public static final String SS_XGJL_WCL = "手术相关记录完成率";
+    public static final String ZRW_XGJL_WCL = "植入物相关记录符合率";
+    public static final String LCYX_XGJL_WCL = "临床用血相关记录符合率";
+    public static final String YSCF_JL_WCL = "医师查房记录完成率";
+    public static final String HZQJ_JLJS_WCL = "患者抢救记录及时完成率";
+    public static final String CCHZ_2DAY_GDL = "出院患者病历2日归档率";
+    public static final String CCHZ_GD_WZL = "出院患者病历归档完整率";
+    public static final String BHL_FZ_FSL = "不合理复制病历发生率";
+    public static final String ZQTYS_GF_QSL = "知情同意书规范签署率";
+    public static final String JJBLL = "甲级病历率";
+    /**
+     * 触发规则指标
+     */
+    public static final String RYJLWWC_24H = "residentAdmitNote";
+    public static final String SSJLWCC_24H = "operationNote";
+    public static final String CYJLWWC_24H = "dischargeRecord";
+    public static final String BASYWWC_24H = "medicalRecord";
+    /**
+     * 医嘱类型
+     */
+    public static final String STANDING_ORDER = "长期医嘱";
+    public static final String STAT_ORDER = "临时医嘱";
+    /**
+     * 医嘱状态
+     */
+    public static final String EXECUTE_ORDER = "执行";
+    public static final String IN_USE = "在用";
+    public static final String CANCELLATION_ORDER = "作废";
+    /**
+     * 医嘱判断相关
+     */
+    public static final String STOP = "停";
+    public static final String LAST = "前一次";
+    public static final String COUNTERMAND = "取消";
+    public static final String PAUSE = "暂停";
+    public static final String BACTERIAL_CULTURE = "细菌培养";
+    /**
+     * 病理判断
+     */
+    public static String[][] BL_LIST = {{"病理"}};
+
+    /**
+     * 医嘱CT相关
+     */
+    public static String[][] CT_LIST = {{"CT"},{"X线"}};
+    public static String[][] CT_REGULATION = {{"ATCH"},{"TCT"},{"HCT"},{"OCT"},{"NCT"},{"LCT"},{"ACT"},{"取消"},{"暂停"}};
+
+    /**
+     * 医嘱手术相关
+     */
+    public static String[][] OPERATION_LIST={
+            {"手术"}
+    };
+    public static String[][] OPERATION_ARG={
+            {"非手术"},
+            {"手术室"},
+            {"手术","取消"},
+            {"暂停","手术"},
+            {"静脉穿刺置管术"},
+            {"停"},
+            {"前一次"},
+            {"特殊病人手术使用一次性卫生材料"},
+            {"人免疫缺陷病毒抗体检测免费"}
+    };
+
+
+    /**
+     * 医嘱MR相关
+     */
+    public static final String MR = "MR";
+    public static String[][] MR_LIST = {{"MR"},{"磁共振"}};
+    public static String[][] MR_REGULATION = {{"IMRT"},{"mrs评分"},{"取消"}};
+    /**
+     * 抗菌药物目录
+     */
+    public static List<String> Antimicrobial_Drug_List = Arrays.asList(
+            "呋喃妥因", "呋喃唑酮", "盐酸小檗碱", "大蒜素", "鱼腥草素钠", "磺胺嘧啶", "甲氧苄啶", "复方磺胺甲恶唑",
+            "磺胺嘧啶银", "磺胺嘧啶锌", "盐酸四环素", "盐酸土霉素", "盐酸多西环素", "盐酸米诺环素", "盐酸美他环素", "硫酸庆大霉素", "硫酸链霉素"
+    );
+    /**
+     * 化疗药物目录
+     */
+    public static List<String> Chemotherapy_Drug_List = Arrays.asList(
+            "注射用盐酸表柔比星", "注射用盐酸吡柔比星", "注射用环磷酰胺", "卡铂注射液", "注射用奥沙利铂", "注射用阿糖胞苷", "注射用盐酸吉西他滨", "注射用甲氨蝶呤",
+            "注射用盐酸伊立替康", "紫杉醇注射液", "注射用培美曲塞二钠", "高三尖杉酯碱注射液", "注射用硫酸长春地辛", "多西他赛注射液", "注射用曲普瑞林", "注射用盐酸博来霉素", "注射用地西他滨",
+            "盐酸伊立替康注射液", "注射用盐酸托泊替康", "注射用氟尿嘧啶", "注射用达卡巴嗪", "醋酸戈舍瑞林缓释植入剂", "顺铂注射液"
+    );
+
+    /**
+     * 抢救药物  维护修改
+     */
+
+    public static List<String> RESCUEDRUGLIST = Arrays.asList(
+            "尼可刹米","可拉明","盐酸洛贝林","山梗菜碱","肾上腺素","阿拉明", "重酒石酸间羟胺", "多巴胺", "利血平", "25%硫酸镁注射液", "垂体后叶素","注射用血凝酶", "阿托品","氯解磷定注射液","盐酸纳洛酮","异丙嗪", "非那更","地西泮", "安定","20%甘露醇");
+
+
+    /**
+     *   临床用血
+     */
+    public static List<String> BLOODLIST = Arrays.asList(
+            "交叉配血","血交叉");
+
+    /**
+     * 用于代码判断指标1、2、3执行路径
+     */
+    public static List<String> FOURSTR = Arrays.asList(
+            "住院病案管理人员月均负担出院患者病历数", "病案编码人员月均负担出院患者病历数", "门诊病案管理人员月均负担门诊患者病历数");
+
+    // 放疗药物目录
+    public static List<String> radiotherapyDrugList = Arrays.asList(
+            "艾迪注射液", "康艾注射液", "康莱特注射液", "鸦胆子油乳注射液", "榄香烯乳注射液", "香菇多糖", "胎盘多肽注射液", "甘露聚糖肽注射液",
+            "脾多肽注射液", "E巨和粒", "欣粒生", "特尔津", "日达仙注射剂", "益比奥", "特比澳", "胸腺五肽", "古拉定","天晴甘美", "易善复", "己糖神经节苷脂钠",
+            "核糖核酸II", "参芪扶正注射液", "甘露醇注射液", "兰索拉唑", "奥西康", "卡络磺钠注射液", "维生素K1注射液", "氨甲苯酸注射液", "酚磺乙胺注射液",
+            "盐酸甲氧氯普胺注", "甲磺酸托烷司琼注射液", "伊班膦酸钠注射液", "唑来膦酸", "盐酸氨溴索注射液","氨茶碱注射液", "孟鲁司特钠片", "阿托伐他汀钙片",
+            "阿卡波糖片", "盐酸二甲双胍片", "瑞格列奈片", "格列齐特片","拉米夫定片","耐信","益血生胶囊","地榆升白片", "鲨肝醇片", "复方皂矾丸", "加巴喷丁胶囊",
+            "塞来昔布胶囊", "氨酚曲马多片", "盐酸羟考酮缓释片","硫酸吗啡缓释片", "盐酸吗啡片","复方甲氧那明胶囊","醋酸甲地孕酮分散","枸橼酸托瑞米芬片","标准桃金娘油肠溶",
+            "甲氧氯普胺片","多潘立酮片"
+    );
+}
+
+
+

common/src/main/java/com/lantone/common/constant/TimeContent.java

@@ -0,0 +1,36 @@
+package com.lantone.common.constant;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 新指标常用常量
+ */
+public class TimeContent {
+
+    public static List<String> HolidaysTimeList = Arrays.asList(
+            "2021-01-01", "2021-01-02", "2021-01-03",//元旦
+            "2021-02-11", "2021-02-12", "2021-02-13", "2021-02-14", "2021-02-15", "2021-02-16", "2021-02-17",//春节
+            "2021-04-03", "2021-04-04", "2021-04-05",//清明节
+            "2021-05-01",  "2021-05-02", "2021-05-03", "2021-05-04", "2021-05-05",//劳动节
+            "2021-06-12",  "2021-06-13", "2021-06-14",//端午节
+            "2021-09-19", "2021-09-20", "2021-09-21",//中秋节
+            "2021-10-01", "2021-10-02", "2021-10-03", "2021-10-04", "2021-10-05", "2021-10-06", "2021-10-07",//国庆节
+
+            "2021-01-09", "2021-01-10", "2021-01-16", "2021-01-17", "2021-01-23", "2021-01-24", "2021-01-30", "2021-01-31",//一月周末假日
+            "2021-02-06", "2021-02-21", "2021-02-27", "2021-02-28", //二月周末假日
+            "2021-03-06", "2021-03-07", "2021-03-13", "2021-03-14", "2021-03-20", "2021-03-21", "2021-03-27", "2021-03-28",//三月周末假日
+            "2021-04-10", "2021-04-11", "2021-04-17", "2021-04-18", "2021-04-24", //四月周末假日
+            "2021-05-09", "2021-05-15", "2021-05-16", "2021-05-22", "2021-05-23", "2021-05-29", "2021-05-30",//五月周末假日
+            "2021-06-05", "2021-06-06", "2021-06-19", "2021-06-20", "2021-06-26", "2021-06-27",//六月周末假日
+            "2021-07-03", "2021-07-04", "2021-07-10", "2021-07-11", "2021-07-17", "2021-07-18", "2021-07-24", "2021-07-25","2021-07-31",//七月周末假日
+            "2021-08-01", "2021-08-07", "2021-08-08", "2021-08-14", "2021-08-15", "2021-08-21", "2021-08-22", "2021-08-28", "2021-08-29",//八月周末假日
+            "2021-09-04", "2021-09-05", "2021-09-11", "2021-09-12", "2021-09-25",//九月周末假日
+            "2021-10-10", "2021-10-16", "2021-10-17", "2021-10-23", "2021-10-24", "2021-10-30", "2021-10-31", //十月周末假日
+            "2021-11-06", "2021-11-07", "2021-11-13", "2021-11-14", "2021-11-20", "2021-11-21", "2021-11-27", "2021-11-28",//十一月周末假日
+            "2021-12-04", "2021-12-06", "2021-12-11", "2021-12-12", "2021-12-18", "2021-12-19", "2021-12-25", "2021-12-26" //十二周末假日
+    );
+}
+
+
+

common/src/main/java/com/lantone/common/dto/report/SysRoleDTO.java

@@ -0,0 +1,53 @@
+package com.lantone.common.dto.report;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/27 10:59
+ */
+@Getter
+@Setter
+public class SysRoleDTO {
+    /**
+     * 角色ID
+     */
+    private Long id;
+
+//    /**
+//     * 是否删除,N:未删除，Y:删除
+//     */
+//    private String isDeleted;
+//
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//    /**
+//     * 记录修改时间,如果时间是1970年则表示纪录未修改
+//     */
+//    private Date gmtModified;
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 修改人,如果为0则表示纪录未修改
+//     */
+//    private String modifier;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色描述
+     */
+    private String descritpion;
+}

common/src/main/java/com/lantone/common/dto/report/SysUserDeptDTO.java

@@ -0,0 +1,19 @@
+package com.lantone.common.dto.report;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/28 9:26
+ */
+@Getter
+@Setter
+public class SysUserDeptDTO {
+    private Long userId;
+    private List<BasDeptInfoDTO> notSelDepts;
+    private List<BasDeptInfoDTO> selDepts;
+}

common/src/main/java/com/lantone/common/dto/report/SysUserRoleDTO.java

@@ -0,0 +1,19 @@
+package com.lantone.common.dto.report;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/28 9:26
+ */
+@Getter
+@Setter
+public class SysUserRoleDTO {
+    private Long userId;
+    private List<SysRoleDTO> notSelRoles;
+    private List<SysRoleDTO> selRoles;
+}

common/src/main/java/com/lantone/common/enums/CheckJobTypeEnum.java

@@ -0,0 +1,51 @@
+package com.lantone.common.enums;
+
+import com.lantone.common.constant.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: 核查任务类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckJobTypeEnum implements KeyedNamed {
+    DEPT_SUPERVISOR(0, "科室任务"),
+    QUAT_SUPERVISOR(1, "质控科任务"),
+    HOSP_SUPERVISOR(2, "院级任务");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckJobTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckJobTypeEnum getEnum(int key) {
+        for (CheckJobTypeEnum item : CheckJobTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckJobTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

common/src/main/java/com/lantone/common/enums/CheckStatusEnum.java

@@ -0,0 +1,50 @@
+package com.lantone.common.enums;
+
+import com.lantone.common.constant.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckStatusEnum implements KeyedNamed {
+    Disable(0, "未核查"),
+    Enable(1, "已核查");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckStatusEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckStatusEnum getEnum(int key) {
+        for (CheckStatusEnum item : CheckStatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

common/src/main/java/com/lantone/common/enums/CheckTypeEnum.java

@@ -0,0 +1,51 @@
+package com.lantone.common.enums;
+
+import com.lantone.common.constant.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: 核查类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckTypeEnum implements KeyedNamed {
+    COURSE(0, "病历"),
+    HOMEPAGE(1, "病案首页"),
+    ALL(2, "全部");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckTypeEnum getEnum(int key) {
+        for (CheckTypeEnum item : CheckTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

common/src/main/java/com/lantone/common/enums/CheckerRoleEnum.java

@@ -0,0 +1,55 @@
+package com.lantone.common.enums;
+
+
+import com.lantone.common.constant.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckerRoleEnum implements KeyedNamed {
+    DEPT_SUPERVISOR(4, "临床科室监管人员"),
+    DEPT_GENERAL(7, "临床科室质控人员"),
+    QUAT_SUPERVISOR(5, "质控科监管人员"),
+    QUAT_GENERAL(8, "质控科质控人员"),
+    HOSP_SUPERVISOR(6, "院级监管人员"),
+    HOSP_GENERAL(9, "院级质控人员");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckerRoleEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckerRoleEnum getEnum(int key) {
+        for (CheckerRoleEnum item : CheckerRoleEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckerRoleEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

common/src/main/java/com/lantone/common/util/ObjectUtil.java

@@ -39,4 +39,33 @@ public class ObjectUtil {
         return (T) object;
     }
 
+    /**
+     * 单个对象的某个键的值
+     *
+     * @param obj 对象
+     * @param key 键
+     * @return Object 键在对象中所对应得值 没有查到时返回空字符串
+     */
+    public static Object getValueByKey(Object obj, String key) {
+        // 得到类对象
+        Class userCla = (Class) obj.getClass();
+        // 得到类中的所有属性集合
+        Field[] fs = userCla.getDeclaredFields();
+        for (int i = 0; i < fs.length; i++) {
+            Field f = fs[i];
+            f.setAccessible(true); // 设置些属性是可以访问的
+            try {
+                if (f.getName().endsWith(key)) {
+                    return f.get(obj);
+                }
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        // 没有查到时返回空字符串
+        return null;
+    }
+
 }

common/src/main/java/com/lantone/common/vo/report/entity/BehospitalInfo.java

@@ -13,6 +13,7 @@ import java.util.Date;
  * 住院病历信息 实体类
  * </p>
  */
+@Data
 public class BehospitalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/AdmissionNote.java

@@ -0,0 +1,384 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 入院记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_admission_note")
+public class AdmissionNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 出生日期
+     */
+    @TableField("birthday")
+    private Date birthday;
+
+    /**
+     * 婚姻状况
+     */
+    @TableField("marriage")
+    private String marriage;
+
+    /**
+     * 职业
+     */
+    @TableField("job_type")
+    private String jobType;
+
+    /**
+     * 民族
+     */
+    @TableField("nation")
+    private String nation;
+
+    /**
+     * 联系电话
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 工作单位
+     */
+    @TableField("workplace")
+    private String workplace;
+
+    /**
+     * 户口地址
+     */
+    @TableField("register_address")
+    private String registerAddress;
+
+    /**
+     * 出生地
+     */
+    @TableField("born_address")
+    private String bornAddress;
+
+    /**
+     * 预产期
+     */
+    @TableField("expect_date")
+    private String expectDate;
+
+    /**
+     * 末次月经
+     */
+    @TableField("last_menstrual")
+    private String lastMenstrual;
+
+    /**
+     * 孕/产次
+     */
+    @TableField("pregnant_num")
+    private String pregnantNum;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 病史陈述者
+     */
+    @TableField("history_teller")
+    private String historyTeller;
+
+    /**
+     * 主诉
+     */
+    @TableField("chief")
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    @TableField("present")
+    private String present;
+
+    /**
+     * 既往史
+     */
+    @TableField("past_history")
+    private String pastHistory;
+
+    /**
+     * 个人史
+     */
+    @TableField("personal_history")
+    private String personalHistory;
+
+    /**
+     * 婚育史
+     */
+    @TableField("marital_history")
+    private String maritalHistory;
+
+    /**
+     * 月经史
+     */
+    @TableField("menstrual_history")
+    private String menstrualHistory;
+
+    /**
+     * 家族史
+     */
+    @TableField("family_history")
+    private String familyHistory;
+
+    /**
+     * 喂养史
+     */
+    @TableField("feeding_history")
+    private String feedingHistory;
+
+    /**
+     * 手术外伤史
+     */
+    @TableField("operation_history")
+    private String operationHistory;
+
+    /**
+     * 输血史
+     */
+    @TableField("blood_history")
+    private String bloodHistory;
+
+    /**
+     * 传染病史
+     */
+    @TableField("infection_history")
+    private String infectionHistory;
+
+    /**
+     * 专科检查
+     */
+    @TableField("special_vital")
+    private String specialVital;
+
+    /**
+     * 辅助检查
+     */
+    @TableField("assistant_exam")
+    private String assistantExam;
+
+    /**
+     * 实验室检查
+     */
+    @TableField("lis_exam")
+    private String lisExam;
+
+    /**
+     * 影像学检查
+     */
+    @TableField("pacs_exam")
+    private String pacsExam;
+
+    /**
+     * 初步诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 补充诊断
+     */
+    @TableField("supply_diagnosis")
+    private String supplyDiagnosis;
+
+    /**
+     * 修正诊断
+     */
+    @TableField("revised_diagnosis")
+    private String revisedDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 体温
+     */
+    @TableField("temperature")
+    private String temperature;
+
+    /**
+     * 脉搏
+     */
+    @TableField("pulse")
+    private String pulse;
+
+    /**
+     * 呼吸
+     */
+    @TableField("breathe")
+    private String breathe;
+
+    /**
+     * 血压
+     */
+    @TableField("blood_pressure")
+    private String bloodPressure;
+
+    /**
+     * 疼痛
+     */
+    @TableField("pain")
+    private String pain;
+
+    /**
+     * 体重
+     */
+    @TableField("weight")
+    private String weight;
+
+    /**
+     * 身高
+     */
+    @TableField("height")
+    private String height;
+
+    /**
+     * BMI
+     */
+    @TableField("bmi")
+    private String bmi;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/BehospitalType.java

@@ -29,7 +29,7 @@ public class BehospitalType implements Serializable {
      * 医院ID
      */
     @TableField("hospital_id")
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 病历号

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/BloodResult.java

@@ -0,0 +1,156 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血效果评价 实体类
+ * </p>
+ */
+@Data
+@TableName("str_blood_result")
+public class BloodResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 效果评价
+     */
+    @TableField("transfusion_evaluate")
+    private String transfusionEvaluate;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/BloodTransfusion.java

@@ -0,0 +1,180 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_blood_transfusion")
+public class BloodTransfusion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private Date endTime;
+
+    /**
+     * 输血原因
+     */
+    @TableField("transfusion_reason")
+    private String transfusionReason;
+
+    /**
+     * 输注种类、血型、数量
+     */
+    @TableField("transfusion_type")
+    private String transfusionType;
+
+    /**
+     * 输注过程
+     */
+    @TableField("transfusion_process")
+    private String transfusionProcess;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/ConsultationApply.java

@@ -0,0 +1,228 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊申请单 实体类
+ * </p>
+ */
+@Data
+@TableName("str_consultation_apply")
+public class ConsultationApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 申请科室
+     */
+    @TableField("apply_dept")
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    @TableField("apply_doctor")
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    @TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    @TableField("invite_type")
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    @TableField("invite_dept")
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    @TableField("invite_doctor")
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("diagnosis")
+    private String diagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    @TableField("treatment_situation")
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    @TableField("consultation_date")
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    @TableField("consultation_purpose")
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    @TableField("consultation_opinions")
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/ConsultationNote.java

@@ -0,0 +1,228 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊单（申请和结果） 实体类
+ * </p>
+ */
+@Data
+@TableName("str_consultation_note")
+public class ConsultationNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    @TableField("apply_dept")
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    @TableField("apply_doctor")
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    @TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    @TableField("invite_type")
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    @TableField("invite_dept")
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    @TableField("invite_doctor")
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    @TableField("treatment_situation")
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    @TableField("consultation_date")
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    @TableField("consultation_purpose")
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    @TableField("consultation_opinions")
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/ConsultationRecord.java

@@ -0,0 +1,228 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_consultation_record")
+public class ConsultationRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    @TableField("apply_dept")
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    @TableField("apply_doctor")
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    @TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    @TableField("invite_type")
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    @TableField("invite_dept")
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    @TableField("invite_doctor")
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    @TableField("treatment_situation")
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    @TableField("consultation_date")
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    @TableField("consultation_purpose")
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    @TableField("consultation_opinions")
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/ConsultationResult.java

@@ -0,0 +1,216 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊结果单 实体类
+ * </p>
+ */
+@Data
+@TableName("str_consultation_result")
+public class ConsultationResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    @TableField("apply_dept")
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    @TableField("apply_doctor")
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    @TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    @TableField("invite_type")
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    @TableField("invite_dept")
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    @TableField("invite_doctor")
+    private String inviteDoctor;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 会诊目的
+     */
+    @TableField("consultation_purpose")
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    @TableField("consultation_opinions")
+    private String consultationOpinions;
+
+    /**
+     * 会诊到达时间
+     */
+    @TableField("consultation_arrive_date")
+    private Date consultationArriveDate;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/CrisisNote.java

@@ -0,0 +1,168 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 危急值记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_crisis_note")
+public class CrisisNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 危急值报告
+     */
+    @TableField("crisis_note")
+    private String crisisNote;
+
+    /**
+     * 病情分析及处理
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 接收时间
+     */
+    @TableField("recieve_date")
+    private Date recieveDate;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/DeathDiscussion.java

@@ -0,0 +1,216 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡病例讨论记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_death_discussion")
+public class DeathDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 死亡诊断
+     */
+    @TableField("death_diagnosis")
+    private String deathDiagnosis;
+
+    /**
+     * 死亡原因
+     */
+    @TableField("death_reason")
+    private String deathReason;
+
+    /**
+     * 死亡时间
+     */
+    @TableField("death_date")
+    private Date deathDate;
+
+    /**
+     * 讨论时间
+     */
+    @TableField("discuss_date")
+    private Date discussDate;
+
+    /**
+     * 讨论地点
+     */
+    @TableField("discuss_place")
+    private String discussPlace;
+
+    /**
+     * 主持人
+     */
+    @TableField("anchor")
+    private String anchor;
+
+    /**
+     * 参加人员
+     */
+    @TableField("participant")
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    @TableField("brief_history")
+    private String briefHistory;
+
+    /**
+     * 讨论内容
+     */
+    @TableField("discussion_content")
+    private String discussionContent;
+
+    /**
+     * 主持人小结
+     */
+    @TableField("anchor_conclusion")
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/DeathNote.java

@@ -0,0 +1,192 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_death_note")
+public class DeathNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 死亡日期
+     */
+    @TableField("death_date")
+    private Date deathDate;
+
+    /**
+     * 入院情况
+     */
+    @TableField("behospital_situation")
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    @TableField("treatment_process")
+    private String treatmentProcess;
+
+    /**
+     * 死亡原因
+     */
+    @TableField("death_reason")
+    private String deathReason;
+
+    /**
+     * 死亡诊断
+     */
+    @TableField("death_diagnosis")
+    private String deathDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/DifficultCase.java

@@ -0,0 +1,198 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 疑难病例讨论记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_difficult_case")
+public class DifficultCase implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 讨论日期
+     */
+    @TableField("discuss_date")
+    private Date discussDate;
+
+    /**
+     * 讨论地点
+     */
+    @TableField("discuss_place")
+    private String discussPlace;
+
+    /**
+     * 主持人姓名及专业技术职务
+     */
+    @TableField("anchor_man")
+    private String anchorMan;
+
+    /**
+     * 参加人员的姓名及专业技术职务
+     */
+    @TableField("participant")
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    @TableField("brief_history")
+    private String briefHistory;
+
+    /**
+     * 讨论目的
+     */
+    @TableField("discuss_aim")
+    private String discussAim;
+
+    /**
+     * 具体讨论意见
+     */
+    @TableField("discussion_opinions")
+    private String discussionOpinions;
+
+    /**
+     * 主持人小结
+     */
+    @TableField("anchor_conclusion")
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/FirstRecord.java

@@ -0,0 +1,210 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 首次病程录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_first_record")
+public class FirstRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 主诉
+     */
+    @TableField("chief")
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    @TableField("present")
+    private String present;
+
+    /**
+     * 既往史
+     */
+    @TableField("past_history")
+    private String pastHistory;
+
+    /**
+     * 查体
+     */
+    @TableField("vital")
+    private String vital;
+
+    /**
+     * 辅检
+     */
+    @TableField("assistant_exam")
+    private String assistantExam;
+
+    /**
+     * 病例特点
+     */
+    @TableField("case_character")
+    private String caseCharacter;
+
+    /**
+     * 初步诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊断依据
+     */
+    @TableField("supply_diagnosis")
+    private String supplyDiagnosis;
+
+    /**
+     * 鉴别诊断
+     */
+    @TableField("revised_diagnosis")
+    private String revisedDiagnosis;
+
+    /**
+     * 诊疗计划(方案)
+     */
+    @TableField("treat_plan")
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/IllCritically.java

@@ -0,0 +1,162 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病危通知单 实体类
+ * </p>
+ */
+@Data
+@TableName("str_ill_critically")
+public class IllCritically implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    @TableField("critical_situation")
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    @TableField("patient_sign")
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    @TableField("patient_sign_date")
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    @TableField("doctor_sign")
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    @TableField("doctor_sign_date")
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/IllSeriousl.java

@@ -0,0 +1,162 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病重通知单 实体类
+ * </p>
+ */
+@Data
+@TableName("str_ill_seriousl")
+public class IllSeriousl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    @TableField("critical_situation")
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    @TableField("patient_sign")
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    @TableField("patient_sign_date")
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    @TableField("doctor_sign")
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    @TableField("doctor_sign_date")
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/IndexRelevance.java

@@ -41,7 +41,7 @@ public class IndexRelevance implements Serializable {
      * 医院ID
      */
     @TableField("hospital_id")
-    private Integer hospitalId;
+    private String hospitalId;
 
     /**
      * 病人病历号
@@ -50,10 +50,10 @@ public class IndexRelevance implements Serializable {
     private String behospitalCode;
 
     @TableField("start_date")
-    private Date startDate;
+    private String startDate;
 
     @TableField("end_date")
-    private Date endDate;
+    private String endDate;
 
     /**
      * 是否删除,N:未删除，Y:删除

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/IndexResult.java

@@ -29,7 +29,7 @@ public class IndexResult implements Serializable {
      * 医院ID
      */
     @TableField("hospital_id")
-    private Integer hospitalId;
+    private String hospitalId;
 
     /**
      * 入院记录24小时内完成率--分母
@@ -122,10 +122,10 @@ public class IndexResult implements Serializable {
     private Double fileCompleteResult;
 
     @TableField("start_date")
-    private Date startDate;
+    private String startDate;
 
     @TableField("end_date")
-    private Date endDate;
+    private String endDate;
 
     /**
      * 是否删除,N:未删除，Y:删除

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/InformedConsent.java

@@ -0,0 +1,91 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.sql.Blob;
+import java.util.Date;
+
+/**
+ * <p>
+ *  实体类
+ * </p>
+ */
+@Data
+@TableName("str_informed_consent")
+public class InformedConsent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 病人住院ID
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 文书内容（blob）
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 文书类别
+     */
+    @TableField("rec_type")
+    private String recType;
+
+    /**
+     * 是否删除,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;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/LeaveHospital.java

@@ -0,0 +1,210 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 出院小结 实体类
+ * </p>
+ */
+@Data
+@TableName("str_leave_hospital")
+public class LeaveHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    @TableField("behospital_date")
+    private Date behospitalDate;
+
+    /**
+     * 出院日期
+     */
+    @TableField("leave_hospital_date")
+    private Date leaveHospitalDate;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 出院诊断
+     */
+    @TableField("leave_diagnosis")
+    private String leaveDiagnosis;
+
+    /**
+     * 住院天数
+     */
+    @TableField("behospital_day_num")
+    private String behospitalDayNum;
+
+    /**
+     * 入院原因
+     */
+    @TableField("behospital_reason")
+    private String behospitalReason;
+
+    /**
+     * 入院情况
+     */
+    @TableField("behospital_situation")
+    private String behospitalSituation;
+
+    /**
+     * 诊治经过
+     */
+    @TableField("treatment_process")
+    private String treatmentProcess;
+
+    /**
+     * 出院情况
+     */
+    @TableField("leave_hospital_situation")
+    private String leaveHospitalSituation;
+
+    /**
+     * 出院医嘱
+     */
+    @TableField("leave_hospital_doctoradvice")
+    private String leaveHospitalDoctoradvice;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/ManagementInfo.java

@@ -53,7 +53,7 @@ public class ManagementInfo implements Serializable {
      * 单位时间内管理人员总人数
      */
     @TableField("work_person")
-    private String workPerson;
+    private Double workPerson;
 
     /**
      * 是否删除,N:未删除，Y:删除

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/OperativeFirstRecord.java

@@ -0,0 +1,257 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术后首程 实体类
+ * </p>
+ */
+@Data
+@TableName("str_operative_first_record")
+public class OperativeFirstRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableField("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 手术日期
+     */
+    @TableField("operation_date")
+    private Date operationDate;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private Date endTime;
+
+    /**
+     * 麻醉方式
+     */
+    @TableField("narcosis_type")
+    private String narcosisType;
+
+    /**
+     * 麻醉医师
+     */
+    @TableField("narcosis_doctor")
+    private String narcosisDoctor;
+
+    /**
+     * 术前诊断
+     */
+    @TableField("preoperation_diagnosis")
+    private String preoperationDiagnosis;
+
+    /**
+     * 术（中）后诊断
+     */
+    @TableField("postoperative_diagnosis")
+    private String postoperativeDiagnosis;
+
+    /**
+     * 手术人员
+     */
+    @TableField("operation_man")
+    private String operationMan;
+
+    /**
+     * 手术名称方式
+     */
+    @TableField("operation_name")
+    private String operationName;
+
+    /**
+     * 手术简要经过
+     */
+    @TableField("operation_process")
+    private String operationProcess;
+
+    /**
+     * 患者术后情况
+     */
+    @TableField("postoperative_situation")
+    private String postoperativeSituation;
+
+    /**
+     * 术后处理措施
+     */
+    @TableField("postoperative_treatment")
+    private String postoperativeTreatment;
+
+    /**
+     * 术后注意事项
+     */
+    @TableField("postoperative_notice")
+    private String postoperativeNotice;
+
+    /**
+     * 术后可能出现的并发症及预防措施
+     */
+    @TableField("postoperative_complication")
+    private String postoperativeComplication;
+
+    /**
+     * 手术切除标本
+     */
+    @TableField("operation_specimen")
+    private String operationSpecimen;
+
+    /**
+     * 术中出血量
+     */
+    @TableField("operation_bleed")
+    private String operationBleed;
+
+    /**
+     * 术中输血量
+     */
+    @TableField("operation_blood_transfusion")
+    private String operationBloodTransfusion;
+
+    /**
+     * 术中并发症
+     */
+    @TableField("operation_complication")
+    private String operationComplication;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/OperativeNote.java

@@ -0,0 +1,264 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_operative_note")
+public class OperativeNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 手术日期
+     */
+    @TableField("operation_date")
+    private Date operationDate;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private Date endTime;
+
+    /**
+     * 术前诊断
+     */
+    @TableField("preoperation_diagnosis")
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术名称
+     */
+    @TableField("operation_name")
+    private String operationName;
+
+    /**
+     * 术（中）后诊断
+     */
+    @TableField("postoperative_diagnosis")
+    private String postoperativeDiagnosis;
+
+    /**
+     * 主刀医师
+     */
+    @TableField("operation_surgeon")
+    private String operationSurgeon;
+
+    /**
+     * 一助
+     */
+    @TableField("first_helping")
+    private String firstHelping;
+
+    /**
+     * 二助
+     */
+    @TableField("second_helping")
+    private String secondHelping;
+
+    /**
+     * 麻醉医师
+     */
+    @TableField("narcosis_doctor")
+    private String narcosisDoctor;
+
+    /**
+     * 麻醉方式
+     */
+    @TableField("narcosis_type")
+    private String narcosisType;
+
+    /**
+     * 切口类别
+     */
+    @TableField("cut_type")
+    private String cutType;
+
+    /**
+     * 病理诊断
+     */
+    @TableField("pathological_diagnosis")
+    private String pathologicalDiagnosis;
+
+    /**
+     * 是否术中植入物
+     */
+    @TableField("is_implants")
+    private String isImplants;
+
+    /**
+     * 植入物名称
+     */
+    @TableField("implants_name")
+    private String implantsName;
+
+    /**
+     * 出血
+     */
+    @TableField("blood_loss")
+    private String bloodLoss;
+
+    /**
+     * 术中所见
+     */
+    @TableField("intraoperative_view")
+    private String intraoperativeView;
+
+    /**
+     * 术后注意事项
+     */
+    @TableField("postoperative_notice")
+    private String postoperativeNotice;
+
+    /**
+     * 手术经过及处理
+     */
+    @TableField("operation_process")
+    private String operationProcess;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/PeriodConclusion.java

@@ -0,0 +1,198 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 阶段小结 实体类
+ * </p>
+ */
+@Data
+@TableName("str_period_conclusion")
+public class PeriodConclusion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 参加人员
+     */
+    @TableField("participant")
+    private String participant;
+
+    /**
+     * 主诉
+     */
+    @TableField("chief")
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    @TableField("behospital_situation")
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊治经过
+     */
+    @TableField("treatment_process")
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 目前情况
+     */
+    @TableField("present_situation")
+    private String presentSituation;
+
+    /**
+     * 诊疗计划
+     */
+    @TableField("treat_plan")
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/PreoperativeDiscussion.java

@@ -0,0 +1,228 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术前讨论小结 实体类
+ * </p>
+ */
+@Data
+@TableName("str_preoperative_discussion")
+public class PreoperativeDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 讨论时间
+     */
+    @TableField("discuss_time")
+    private Date discussTime;
+
+    /**
+     * 讨论方式
+     */
+    @TableField("discuss_type")
+    private String discussType;
+
+    /**
+     * 参加人员
+     */
+    @TableField("participant")
+    private String participant;
+
+    /**
+     * 简要病情
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 术前诊断
+     */
+    @TableField("preoperation_diagnosis")
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术指征与禁忌
+     */
+    @TableField("operation_indication")
+    private String operationIndication;
+
+    /**
+     * 可替代的方案
+     */
+    @TableField("replace_plan")
+    private String replacePlan;
+
+    /**
+     * 拟施手术方式、名称及可能的变更与禁忌症
+     */
+    @TableField("operation_name")
+    private String operationName;
+
+    /**
+     * 拟施麻醉方式
+     */
+    @TableField("anesthesia_type")
+    private String anesthesiaType;
+
+    /**
+     * 术前准备
+     */
+    @TableField("preoperation_prepare")
+    private String preoperationPrepare;
+
+    /**
+     * 主要术中、术后风险及防范措施
+     */
+    @TableField("intraoperative_risk")
+    private String intraoperativeRisk;
+
+    /**
+     * 术中注意事项
+     */
+    @TableField("intraoperative_notice")
+    private String intraoperativeNotice;
+
+    /**
+     * 术后注意事项
+     */
+    @TableField("postoperative_notice")
+    private String postoperativeNotice;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/RescueNote.java

@@ -0,0 +1,180 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 抢救记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_rescue_note")
+public class RescueNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 开始时间
+     */
+    @TableField("start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField("end_time")
+    private Date endTime;
+
+    /**
+     * 简要病情
+     */
+    @TableField("brief_note")
+    private String briefNote;
+
+    /**
+     * 抢救措施
+     */
+    @TableField("resuscitation")
+    private String resuscitation;
+
+    /**
+     * 参加抢救的医务人员姓名及专业技术职称
+     */
+    @TableField("rescue_man")
+    private String rescueMan;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/TaskCron.java

@@ -0,0 +1,91 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 定时任务 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_task_cron")
+public class TaskCron implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,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("cron_code")
+    private String cronCode;
+
+    /**
+     * 任务执行周期
+     */
+    @TableField("cron")
+    private String cron;
+
+    /**
+     * 参数
+     */
+    @TableField("param")
+    private String param;
+
+    /**
+     * 0-未启用 1-启用
+     */
+    @TableField("is_used")
+    private Integer isUsed;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/TransferInNote.java

@@ -0,0 +1,210 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转入记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_transfer_in_note")
+public class TransferInNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 转入日期
+     */
+    @TableField("transfer_in_date")
+    private Date transferInDate;
+
+    /**
+     * 转出科室
+     */
+    @TableField("transfer_out_dept")
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    @TableField("transfer_in_dept")
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    @TableField("chief")
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    @TableField("behospital_situation")
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    @TableField("current_situation")
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    @TableField("treatment_process")
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    @TableField("treat_plan")
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/TransferOutNote.java

@@ -0,0 +1,210 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转出记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_transfer_out_note")
+public class TransferOutNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 转入日期
+     */
+    @TableField("transfer_in_date")
+    private Date transferInDate;
+
+    /**
+     * 转出科室
+     */
+    @TableField("transfer_out_dept")
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    @TableField("transfer_in_dept")
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    @TableField("chief")
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    @TableField("behospital_situation")
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    @TableField("current_situation")
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    @TableField("tentative_diagnosis")
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    @TableField("treatment_process")
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    @TableField("current_diagnosis")
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    @TableField("treat_plan")
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/UserDept.java

@@ -0,0 +1,84 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户-医院科室映射表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_dept")
+public class UserDept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,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("user_id")
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 科室编码（HIS导入）
+     */
+    @TableField("dept_id")
+    private String deptId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/UserHospital.java

@@ -0,0 +1,78 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户-机构表映射表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_hospital")
+public class UserHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,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("user_id")
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/WardRecord.java

@@ -0,0 +1,192 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 查房记录 实体类
+ * </p>
+ */
+@Data
+@TableName("str_ward_record")
+public class WardRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    @TableId("rec_id")
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private String age;
+
+    /**
+     * 床号
+     */
+    @TableField("bed_no")
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    @TableField("record_date")
+    private Date recordDate;
+
+    /**
+     * 查房日期
+     */
+    @TableField("ward_date")
+    private Date wardDate;
+
+    /**
+     * 查房医生
+     */
+    @TableField("ward_doctor")
+    private String wardDoctor;
+
+    /**
+     * 标题
+     */
+    @TableField("ward_title")
+    private String wardTitle;
+
+    /**
+     * 病情记录
+     */
+    @TableField("ward_content")
+    private String wardContent;
+
+    /**
+     * S
+     */
+    @TableField("ward_s")
+    private String wardS;
+
+    /**
+     * O
+     */
+    @TableField("ward_o")
+    private String wardO;
+
+    /**
+     * A
+     */
+    @TableField("ward_a")
+    private String wardA;
+
+    /**
+     * P
+     */
+    @TableField("ward_p")
+    private String wardP;
+
+    /**
+     * 记录医生
+     */
+    @TableField("rec_doctor")
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    @TableField("rec_date")
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    @TableField("audit_doctor")
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    @TableField("audit_date")
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    @TableField("whole_data")
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    @TableField("modifier")
+    private String modifier;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/AdmissionNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.AdmissionNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_admission_note 业务类
+ * </p>
+ */
+@Component
+public class AdmissionNoteFacade extends AdmissionNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/BehospitalInfoFacade.java

@@ -1,8 +1,14 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.lantone.common.dto.report.BehospitalInfoAgeDTO;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
 import com.lantone.dblayermbg.service.impl.report.BehospitalInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 表名：med_behospital_info 业务类
@@ -10,5 +16,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
+    /**
+     * 获取患者年龄信息(通过出生日期和入院日期重新计算)
+     *
+     * @param hospitalId
+     * @param behospitalCodes
+     * @return
+     */
+   /* public List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes) {
+        if (hospitalId == null || ListUtil.isEmpty(behospitalCodes)) {
+            return new ArrayList<>();
+        }
+        List<BehospitalInfoAgeDTO> behospitalInfoAgeDTOList = this.baseMapper.getBehospitalInfoAge(hospitalId, behospitalCodes);
+        if (behospitalInfoAgeDTOList == null) {
+            return new ArrayList<>();
+        }
+
+        behospitalInfoAgeDTOList.forEach(behospitalInfoAgeDTO -> {
+            String age = "";
+            if (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeYear()) && !behospitalInfoAgeDTO.getAgeYear().equals("0")) {
+                age += behospitalInfoAgeDTO.getAgeYear() + "岁";
+            } else {
+                age += (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeMon()) && !behospitalInfoAgeDTO.getAgeMon().equals("0") ? (behospitalInfoAgeDTO.getAgeMon() + "个月") : "")
+                        + (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeDay()) && !behospitalInfoAgeDTO.getAgeDay().equals("0") ? (behospitalInfoAgeDTO.getAgeDay() + "天") : "");
+            }
+            behospitalInfoAgeDTO.setAge(age);
+        });
 
+        return behospitalInfoAgeDTOList;
+    }*/
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/BloodResultFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.BloodResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_blood_result 业务类
+ * </p>
+ */
+@Component
+public class BloodResultFacade extends BloodResultServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/BloodTransfusionFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.BloodTransfusionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_blood_transfusion 业务类
+ * </p>
+ */
+@Component
+public class BloodTransfusionFacade extends BloodTransfusionServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/CasesFacade.java

@@ -1,8 +1,18 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.dto.report.QcCasesAllDTO;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.vo.report.QcCasesEntryVO;
+import com.lantone.dblayermbg.entity.report.Cases;
 import com.lantone.dblayermbg.service.impl.report.CasesServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 表名：qc_cases 业务类
@@ -10,5 +20,20 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class CasesFacade extends CasesServiceImpl {
-
+    /**
+     * 获取基础模块数据信息
+     *
+     * @return 基础模块数据信息列表
+     */
+    public List<QcCasesAllDTO> getQcCasesAlls(QcCasesEntryVO qcCasesEntryVO) {
+        QueryWrapper<Cases> qc = new QueryWrapper<>();
+        qc.eq("is_deleted", IsDeleteEnum.N.getKey());
+        if(StringUtils.isNotBlank(qcCasesEntryVO.getCasesName())){
+            qc.like("name", qcCasesEntryVO.getCasesName());
+        }
+        List<Cases> data = list(qc);
+        List<QcCasesAllDTO> dataNew = new ArrayList<QcCasesAllDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcCasesAllDTO.class);
+        return dataNew;
+    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/ConsultationApplyFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.ConsultationApplyServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_consultation_apply 业务类
+ * </p>
+ */
+@Component
+public class ConsultationApplyFacade extends ConsultationApplyServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/ConsultationNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.ConsultationNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_consultation_note 业务类
+ * </p>
+ */
+@Component
+public class ConsultationNoteFacade extends ConsultationNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/ConsultationRecordFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.ConsultationRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_consultation_record 业务类
+ * </p>
+ */
+@Component
+public class ConsultationRecordFacade extends ConsultationRecordServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/ConsultationResultFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.ConsultationResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_consultation_result 业务类
+ * </p>
+ */
+@Component
+public class ConsultationResultFacade extends ConsultationResultServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/CrisisNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.CrisisNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_crisis_note 业务类
+ * </p>
+ */
+@Component
+public class CrisisNoteFacade extends CrisisNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/DeathDiscussionFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.DeathDiscussionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_death_discussion 业务类
+ * </p>
+ */
+@Component
+public class DeathDiscussionFacade extends DeathDiscussionServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/DeathNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.DeathNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_death_note 业务类
+ * </p>
+ */
+@Component
+public class DeathNoteFacade extends DeathNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/DifficultCaseFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.DifficultCaseServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_difficult_case 业务类
+ * </p>
+ */
+@Component
+public class DifficultCaseFacade extends DifficultCaseServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/DoctorAdviceFacade.java

@@ -1,8 +1,15 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.DoctorAdviceDTO;
+import com.lantone.common.vo.report.DoctorAdviceVO;
 import com.lantone.dblayermbg.service.impl.report.DoctorAdviceServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * <p>
  * 表名：med_doctor_advice 业务类
@@ -11,4 +18,27 @@ import org.springframework.stereotype.Component;
 @Component
 public class DoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
+
+    public IPage<DoctorAdviceDTO> getPage(DoctorAdviceVO doctorAdviceVO) {
+
+        List<String> infos = this.baseMapper.getInfo(doctorAdviceVO.getHospitalId(), doctorAdviceVO.getBehospitalCode());
+        Set<String> infoSet = new HashSet<>();
+        for (String s : infos) {
+            if (s.contains("医嘱：")) {
+                String[] split = s.split("_");
+                for (String info : split) {
+                    String[] targetInfos = info.split("：");
+                    for (String target : targetInfos) {
+                        if (!"医嘱".equals(target)) {
+                            infoSet.add(target);
+                        }
+                    }
+                }
+            }
+        }
+
+        IPage<DoctorAdviceDTO> page = this.baseMapper.getPage(doctorAdviceVO, infoSet);
+        return page;
+    }
+
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/FirstRecordFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.FirstRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_first_record 业务类
+ * </p>
+ */
+@Component
+public class FirstRecordFacade extends FirstRecordServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/IllCriticallyFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.IllCriticallyServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_ill_critically 业务类
+ * </p>
+ */
+@Component
+public class IllCriticallyFacade extends IllCriticallyServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/IllSeriouslFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.IllSeriouslServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_ill_seriousl 业务类
+ * </p>
+ */
+@Component
+public class IllSeriouslFacade extends IllSeriouslServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/InformedConsentFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.InformedConsentServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_informed_consent 业务类
+ * </p>
+ */
+@Component
+public class InformedConsentFacade extends InformedConsentServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/LeaveHospitalFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.LeaveHospitalServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_leave_hospital 业务类
+ * </p>
+ */
+@Component
+public class LeaveHospitalFacade extends LeaveHospitalServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/LisInfoFacade.java

@@ -1,8 +1,19 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.ExamineInfoDTO;
+import com.lantone.common.dto.report.ExamineSonInfoDTO;
+import com.lantone.common.vo.report.ExamineInfoVO;
+import com.lantone.common.vo.report.ExamineSonInfoVO;
 import com.lantone.dblayermbg.service.impl.report.LisInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * <p>
  * 表名：med_lis_info 业务类
@@ -11,4 +22,74 @@ import org.springframework.stereotype.Component;
 @Component
 public class LisInfoFacade extends LisInfoServiceImpl {
 
+
+    public IPage<ExamineInfoDTO> getExamineInfo(ExamineInfoVO examineInfoVO) {
+
+        List<String> infos = this.baseMapper.getInfo(examineInfoVO.getHospitalId(), examineInfoVO.getBehospitalCode());
+
+        Set<String> infoSet = new HashSet<>();
+        for (String s : infos) {
+            if (s.contains("化验：")) {
+                String[] split = s.split("_");
+                for (String info : split) {
+                    String[] targetInfos = info.split("：");
+                    for (String targetInfo : targetInfos) {
+                        if (!"化验".equals(targetInfo)) {
+                            infoSet.add(targetInfo);
+                        }
+                    }
+                }
+            }
+        }
+
+        //获取病人进出院时间
+        Map<String, Object> timeMap = this.baseMapper.getTime(examineInfoVO.getBehospitalCode());
+        if (null != timeMap) {
+            if(null !=  timeMap.get("behospital_date")){
+                Date behospital_date = (Date) timeMap.get("behospital_date");
+                examineInfoVO.setBehospitalDate(behospital_date);
+            }
+            if(null != timeMap.get("leave_hospital_date")){
+                Date leaveHospitalDate = (Date) timeMap.get("leave_hospital_date");
+                examineInfoVO.setLeaveHospitalDate(leaveHospitalDate);
+            }
+        }
+
+        String behospitalCode = examineInfoVO.getBehospitalCode();
+        if (2l == examineInfoVO.getHospitalId()) {
+            examineInfoVO.setBehospitalCode(behospitalCode.split("_")[0]);
+        }
+
+        //获取缺陷检验项目
+        List<String> badCheckInfo = this.baseMapper.getBadExamineInfo(examineInfoVO, infoSet);
+        //获取缺陷判别类别检查项目
+        IPage<ExamineInfoDTO> page = this.baseMapper.getExamineInfo(examineInfoVO, infoSet,badCheckInfo);
+        return page;
+    }
+
+    public IPage<ExamineSonInfoDTO> getExamineSonInfo(ExamineSonInfoVO examineSonInfoVO) {
+        List<String> infos = this.baseMapper.getInfo(examineSonInfoVO.getHospitalId(), examineSonInfoVO.getBehospitalCode());
+        Set<String> infoSet = new HashSet<>();
+        for (String s : infos) {
+            if (s.contains("化验：")) {
+                String[] split = s.split("_");
+                for (String info : split) {
+                    String[] targetInfos = info.split("：");
+                    for (String targetInfo : targetInfos) {
+                        if (!"化验".equals(targetInfo)) {
+                            infoSet.add(targetInfo);
+                        }
+                    }
+                }
+            }
+        }
+        String behospitalCode = examineSonInfoVO.getBehospitalCode();
+        if (2l == examineSonInfoVO.getHospitalId()) {
+            examineSonInfoVO.setBehospitalCode(behospitalCode.split("_")[0]);
+        }
+
+        IPage<ExamineSonInfoDTO> page = this.baseMapper.getExamineSonInfo(examineSonInfoVO, infoSet);
+        return page;
+    }
+
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/OperativeFirstRecordFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.OperativeFirstRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_operative_first_record 业务类
+ * </p>
+ */
+@Component
+public class OperativeFirstRecordFacade extends OperativeFirstRecordServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/OperativeNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.OperativeNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_operative_note 业务类
+ * </p>
+ */
+@Component
+public class OperativeNoteFacade extends OperativeNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/PacsInfoFacade.java

@@ -1,7 +1,15 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.CheckInfoDTO;
+import com.lantone.common.vo.report.CheckInfoVO;
 import com.lantone.dblayermbg.service.impl.report.PacsInfoServiceImpl;
 import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -11,4 +19,45 @@ import org.springframework.stereotype.Component;
 @Component
 public class PacsInfoFacade extends PacsInfoServiceImpl {
 
+    public IPage<CheckInfoDTO> getCheckInfo(CheckInfoVO checkInfoVO) {
+
+        List<String> infos = this.baseMapper.getInfo(checkInfoVO.getHospitalId(), checkInfoVO.getBehospitalCode());
+
+        Set<String> infoSet = new HashSet<>();
+        for (String s : infos) {
+            if (s.contains("检查：")) {
+                String[] split = s.split("_");
+                for (String info : split) {
+                    String[] targetInfos = info.split("：");
+                    for (String targetInfo : targetInfos) {
+                        if (!"检查".equals(targetInfo)) {
+                            infoSet.add(targetInfo);
+                        }
+
+                    }
+
+                }
+            }
+        }
+
+        //获取病人进出院时间
+        Map<String, Object> timeMap = this.baseMapper.getTime(checkInfoVO.getBehospitalCode());
+        if (null != timeMap) {
+            if(null != timeMap.get("behospital_date")){
+                Date behospital_date = (Date) timeMap.get("behospital_date");
+                checkInfoVO.setBehospitalDate(behospital_date);
+            }
+            if(null != timeMap.get("leave_hospital_date")){
+                Date leaveHospitalDate = (Date) timeMap.get("leave_hospital_date");
+                checkInfoVO.setLeaveHospitalDate(leaveHospitalDate);
+            }
+        }
+        String behospitalCode = checkInfoVO.getBehospitalCode();
+        if(2l == checkInfoVO.getHospitalId()){
+            checkInfoVO.setBehospitalCode(behospitalCode.split("_")[0]);
+        }
+
+        IPage<CheckInfoDTO> page = this.baseMapper.getCheckInfo(checkInfoVO, infoSet);
+        return page;
+    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/PeriodConclusionFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.PeriodConclusionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_period_conclusion 业务类
+ * </p>
+ */
+@Component
+public class PeriodConclusionFacade extends PeriodConclusionServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/PreoperativeDiscussionFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.PreoperativeDiscussionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_preoperative_discussion 业务类
+ * </p>
+ */
+@Component
+public class PreoperativeDiscussionFacade extends PreoperativeDiscussionServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/QcresultInfoFacade.java

@@ -1,5 +1,11 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.dto.report.QcResultDTO;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.vo.report.GetDetailVO;
+import com.lantone.dblayermbg.entity.report.QcresultInfo;
 import com.lantone.dblayermbg.service.impl.report.QcresultInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -10,5 +16,25 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class QcresultInfoFacade extends QcresultInfoServiceImpl {
+    /**
+     * 获取评分主表信息
+     *
+     * @param getDetailVO
+     * @return
+     */
+    public QcResultDTO getByBehospitalCode(GetDetailVO getDetailVO) {
+        QcResultDTO res = new QcResultDTO();
+        QcresultInfo qcresultInfo = this.getOne(new QueryWrapper<QcresultInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", getDetailVO.getHospitalId())
+                .eq("behospital_code", getDetailVO.getBehospitalCode()), false
+        );
+        if (qcresultInfo != null) {
+            BeanUtil.copyProperties(qcresultInfo, res);
+        } else {
+            return null;
+        }
+        return res;
+    }
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/QuestionInfoFacade.java

@@ -1,8 +1,23 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.dto.report.QuestionDTO;
+import com.lantone.common.dto.report.QuestionEntryDTO;
+import com.lantone.common.dto.report.wrapper.QuestionInfoWrapper;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.EntityUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.vo.report.QuestionIdsVO;
+import com.lantone.dblayermbg.entity.report.QuestionInfo;
 import com.lantone.dblayermbg.service.impl.report.QuestionInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 表名：qc_question_info 业务类
@@ -11,4 +26,41 @@ import org.springframework.stereotype.Component;
 @Component
 public class QuestionInfoFacade extends QuestionInfoServiceImpl {
 
+    public Map<Long, List<QuestionEntryDTO>> getByCaseEntryIdsFac(Map map) {
+        List<QuestionEntryDTO> questionEntryDTOList = this.getBaseMapper().getByCaseEntryIds(map);
+        return  EntityUtil.makeEntityListMap(questionEntryDTOList, "casesEntryId");
+    }
+
+    /**
+     * 查询多个id返回标签内容【优化版】
+     *
+     * @param questionIdsVO 获取标签内容参数
+     * @return 标签内容Fac
+     */
+    public Map<Long, QuestionDTO> getByIds(QuestionIdsVO questionIdsVO) {
+        List<Long> idList = questionIdsVO.getIds();
+        if (ListUtil.isEmpty(idList)) {
+            return new HashMap<>();
+        }
+        List<QuestionInfo> qcQuestionInfoList = this.list(new QueryWrapper<QuestionInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("id", idList)
+        );
+        List<QuestionDTO> questionDTOList = BeanUtil.listCopyTo(qcQuestionInfoList, QuestionDTO.class);
+        if (ListUtil.isNotEmpty(questionDTOList)) {
+            List<Long> ids = questionDTOList.stream().map(r -> r.getId()).collect(Collectors.toList());
+            Map paramMap = new HashMap<>();
+            paramMap.put("ids", ids);
+            //获取子标签
+            List<QuestionInfoWrapper> questionMapping = this.getBaseMapper().getByQuestionMapping(paramMap);
+            Map<Long, List<QuestionInfoWrapper>> map = EntityUtil.makeEntityListMap(questionMapping, "parentQuestion");
+            for (QuestionDTO bean : questionDTOList) {
+                List<QuestionInfoWrapper> questionInfoWrapperList = map.get(bean.getId());
+                if (ListUtil.isNotEmpty(questionInfoWrapperList)) {
+                    bean.setQuestionMapping(BeanUtil.listCopyTo(questionInfoWrapperList, QuestionDTO.class));
+                }
+            }
+        }
+        return questionDTOList.stream().collect(Collectors.toMap(r -> r.getId(), r -> r));
+    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/RescueNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.RescueNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_rescue_note 业务类
+ * </p>
+ */
+@Component
+public class RescueNoteFacade extends RescueNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/TaskCronFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.TaskCronServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_task_cron 业务类
+ * </p>
+ */
+@Component
+public class TaskCronFacade extends TaskCronServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/TransferInNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.TransferInNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_transfer_in_note 业务类
+ * </p>
+ */
+@Component
+public class TransferInNoteFacade extends TransferInNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/TransferOutNoteFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.TransferOutNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_transfer_out_note 业务类
+ * </p>
+ */
+@Component
+public class TransferOutNoteFacade extends TransferOutNoteServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserDeptFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.UserDeptServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_dept 业务类
+ * </p>
+ */
+@Component
+public class UserDeptFacade extends UserDeptServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserHospitalFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.UserHospitalServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_hospital 业务类
+ * </p>
+ */
+@Component
+public class UserHospitalFacade extends UserHospitalServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/WardRecordFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.WardRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：str_ward_record 业务类
+ * </p>
+ */
+@Component
+public class WardRecordFacade extends WardRecordServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/AdmissionNoteMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.AdmissionNote;
+
+/**
+ * <p>
+ * 表名：str_admission_note Mapper接口
+ * </p>
+ */
+public interface AdmissionNoteMapper extends BaseMapper<AdmissionNote> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/BehospitalInfoMapper.java

@@ -2,16 +2,43 @@ package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.BehospitalInfoAgeDTO;
+import com.lantone.common.dto.report.BehospitalInfoDTO;
+import com.lantone.common.dto.report.CaseScoreDTO;
+import com.lantone.common.dto.report.EntryStatisticsDTO;
 import com.lantone.common.dto.report.ExportExcelDTO;
+import com.lantone.common.dto.report.HomePageImproveDTO;
+import com.lantone.common.dto.report.HomePageNumDTO;
+import com.lantone.common.dto.report.LevelStatisticsDTO;
+import com.lantone.common.dto.report.LevelStatisticsTZDTO;
+import com.lantone.common.dto.report.MedManageParamsDTO;
+import com.lantone.common.dto.report.MedicalCheckDTO;
+import com.lantone.common.dto.report.MedicalCheckExportDTO;
+import com.lantone.common.dto.report.MedicalCheckIdNameDTO;
+import com.lantone.common.dto.report.MsgDTO;
+import com.lantone.common.dto.report.NumDTO;
 import com.lantone.common.dto.report.QcResultShortDTO;
+import com.lantone.common.dto.report.QualityControlDTO;
 import com.lantone.common.dto.report.ReBeHosMergeDTO;
+import com.lantone.common.dto.report.UnModifyMRDetailDTO;
+import com.lantone.common.vo.report.AnalyzeVO;
+import com.lantone.common.vo.report.BehospitalPageVO;
+import com.lantone.common.vo.report.CaseScoreVO;
+import com.lantone.common.vo.report.EntryStatisticsVO;
+import com.lantone.common.vo.report.ExportQcresultVO;
+import com.lantone.common.vo.report.FilterMedicalCheckVO;
+import com.lantone.common.vo.report.FilterOrderVO;
+import com.lantone.common.vo.report.FilterUnModifyMRVO;
 import com.lantone.common.vo.report.FilterVO;
+import com.lantone.common.vo.report.MedIndexFilterVO;
+import com.lantone.common.vo.report.QcResultPageVO;
 import com.lantone.common.vo.report.QcResultShortPageVO;
 import com.lantone.common.vo.report.ReBeHosPageVO;
 import com.lantone.dblayermbg.entity.report.BehospitalInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -83,5 +110,279 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<ExportExcelDTO> leaveHosMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
+    /**
+     * 各科室缺陷占比（组合）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
+
+    /**
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
+
+    /**
+     * 病案首页质控病历数统计-全院（首页）
+     *
+     * @param filterVO
+     * @return
+     */
+    public HomePageNumDTO homePageQcPercent(FilterVO filterVO);
+
+    /**
+     * 病案首页完整率统计-全院（首页）
+     *
+     * @param filterVO
+     * @return
+     */
+    public HomePageNumDTO hmEmptyEntryPercent(FilterVO filterVO);
+
+    /**
+     * 改善率统计-全院（首页）
+     *
+     * @param filterVO
+     * @return
+     */
+    public HomePageImproveDTO homePageImproveCount(FilterVO filterVO);
+
+    /**
+     * 病案首页合格率占比
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
+
+    /**
+     * 入院人数统计-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public List<NumDTO> beHosCount(FilterVO filterVO);
+
+    /**
+     * 单条条目缺陷统计-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public List<NumDTO> casesEntryStatisticsById(FilterVO filterVO);
+
+    /**
+     * 关键条目缺陷占比统计
+     *
+     * @param entryStatisticsVO
+     * @return
+     */
+    public List<EntryStatisticsDTO> entryStatistics(EntryStatisticsVO entryStatisticsVO);
+
+    /**
+     * 质控核查统计（内页）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<HomePageImproveDTO> qcCheckStatistics(FilterOrderVO filterOrderVO);
+
+    /**
+     * 时效性相关统计
+     *
+     * @param filterUnModifyMRVO
+     * @return
+     */
+    public List<UnModifyMRDetailDTO> unModifyMRStatistics(FilterUnModifyMRVO filterUnModifyMRVO);
+
+    /**
+     * 病历稽查表-1
+     *
+     * @param filterVO
+     * @return
+     */
+    public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO);
+
+    /**
+     * 病历稽查表-2
+     *
+     * @param casesEntryIds
+     * @return
+     */
+
+    public List<MedicalCheckIdNameDTO> getMedicalEntryIds(@Param("casesEntryIds") List<Long> casesEntryIds);
+
+    /**
+     * 病历稽查表导出
+     *
+     * @param filterVO
+     * @return
+     */
+    public List<MedicalCheckExportDTO> getMedicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO);
+
+    /**
+     * 病历质控报表
+     *
+     * @param behospitalPageVO
+     * @return
+     */
+    public IPage<QualityControlDTO> getQualityControl(BehospitalPageVO behospitalPageVO);
+
+    /**
+     * 病历质控报表-扣分数据
+     *
+     * @param caseScoreVO
+     * @return
+     */
+    public List<CaseScoreDTO> getQualityCaseSorce(CaseScoreVO caseScoreVO);
+
+    /**
+     * 病历分页列表
+     * @param behospitalPageVO
+     * @return
+     */
+    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
+
+    /**
+     * 病历列表-报表导出
+     *
+     * @param exportQcresultVO
+     * @return
+     */
+    public List<ExportExcelDTO> exportQcresult(ExportQcresultVO exportQcresultVO);
+
+    /**
+     * 条目缺陷质控评分页（内页）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 条目缺陷病历列表-报表导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public List<ExportExcelDTO> qcResultShortPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 病案首页合格|不合格病历列表-报表
+     *
+     * @param qcResultPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultPageVO") QcResultPageVO qcResultPageVO);
+
+    /**
+     *  病案首页合格|不合格病历列表-报表导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+
+    public List<ExportExcelDTO> badLevelPagePageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 质控核查统计病历列表-报表
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> qcCheckMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 质控核查质控评分页导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public List<ExportExcelDTO> qcCheckMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 病案首页改善率质控评分页（内页）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> hmImproveMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 时效性|稽查条目病历列表-报表
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> unModifyMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    /**
+     * 未整改病历缺陷评分详情页导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+
+    public List<ExportExcelDTO> unModifyMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+
+    public List<MsgDTO> getMsg(AnalyzeVO analyzeVO);
+
+    /**
+     * 病理CT/MR触发多规则人数
+     * @param filterVO
+     * @return
+     */
+    public Map<String,Long> triggeringRules(@Param("filterVO") FilterVO filterVO);
+
+    /**
+     * 病案管理指标获取基础数据
+     *
+     * @param timeVo
+     * @return
+     */
+    public Map<String,Object> getBaseIndex( MedIndexFilterVO timeVo);
+
+    /**
+     * 手术费，抗菌药物，手术和病理费等含有人数
+     *
+     * @param filterVO
+     * @return
+     */
+    public List<Map<String, String>> selectOperationNum(@Param("filterVO") FilterVO filterVO);
+
+    /**
+     * 病案管理规则质控病历参数查询
+     *
+     * @param filterVO
+     * @return
+     */
+
+    public List<MedManageParamsDTO> getMedManageParams(FilterVO filterVO);
+
+    /**
+     * 病案首页关联的出院病历
+     * @param filterVO
+     * @return
+     */
+    public List<Map<String,String>> getMedicalRecords(@Param("filterVO") FilterVO filterVO);
+
+    /**
+     * 首页恶性肿瘤人数
+     * @param filterVO
+     * @return
+     */
+    public List<Map<String,String>> malignancy(@Param("filterVO") FilterVO filterVO);
+
+    /**
+     * 获取患者年龄信息(通过出生日期和入院日期重新计算)
+     * @param hospitalId
+     * @param behospitalCodes
+     * @return
+     */
+    List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes);
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/BloodResultMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.BloodResult;
+
+/**
+ * <p>
+ * 表名：str_blood_result Mapper接口
+ * </p>
+ */
+public interface BloodResultMapper extends BaseMapper<BloodResult> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/BloodTransfusionMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.BloodTransfusion;
+
+/**
+ * <p>
+ * 表名：str_blood_transfusion Mapper接口
+ * </p>
+ */
+public interface BloodTransfusionMapper extends BaseMapper<BloodTransfusion> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/CheckInfoMapper.java

@@ -1,13 +1,39 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.CheckJobDTO;
+import com.lantone.common.dto.report.CheckUserDTO;
+import com.lantone.common.dto.report.CheckWorkDTO;
+import com.lantone.common.dto.report.CheckedRecordListDTO;
+import com.lantone.common.dto.report.DeptCheckUserDTO;
+import com.lantone.common.vo.report.CheckJobPageVO;
+import com.lantone.common.vo.report.CheckUserVO;
+import com.lantone.common.vo.report.CheckWorkPageVO;
+import com.lantone.common.vo.report.CheckedRecordListVO;
 import com.lantone.dblayermbg.entity.report.CheckInfo;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名：med_check_info Mapper接口
  * </p>
  */
 public interface CheckInfoMapper extends BaseMapper<CheckInfo> {
+    //获取未分配的核查任务
+    IPage<CheckJobDTO> getCheckList(CheckJobPageVO checkJobVO);
+    //临床科室核查人员通过id获取核查人员的核查任务数
+    List<DeptCheckUserDTO> getDeptJobNumByUserId(CheckUserVO checkUserVO);
+    //核查任务列表
+    IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
+    //获取指定核查人员的核查任务
+    IPage<CheckJobDTO> getCheckListByUserId(CheckJobPageVO checkJobVO);
+    //取消核查任务
+    int deleteBatchCodes(List<String> list);
+
+    IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO);
+    //获取核查人员用户科室、姓名、角色
+    List<CheckUserDTO> getCheckUser(CheckUserVO checkUserVOS);
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/ConsultationApplyMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.ConsultationApply;
+
+/**
+ * <p>
+ * 表名：str_consultation_apply Mapper接口
+ * </p>
+ */
+public interface ConsultationApplyMapper extends BaseMapper<ConsultationApply> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/ConsultationNoteMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.ConsultationNote;
+
+/**
+ * <p>
+ * 表名：str_consultation_note Mapper接口
+ * </p>
+ */
+public interface ConsultationNoteMapper extends BaseMapper<ConsultationNote> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/ConsultationRecordMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.ConsultationRecord;
+
+/**
+ * <p>
+ * 表名：str_consultation_record Mapper接口
+ * </p>
+ */
+public interface ConsultationRecordMapper extends BaseMapper<ConsultationRecord> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/ConsultationResultMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.ConsultationResult;
+
+/**
+ * <p>
+ * 表名：str_consultation_result Mapper接口
+ * </p>
+ */
+public interface ConsultationResultMapper extends BaseMapper<ConsultationResult> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/CrisisNoteMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.CrisisNote;
+
+/**
+ * <p>
+ * 表名：str_crisis_note Mapper接口
+ * </p>
+ */
+public interface CrisisNoteMapper extends BaseMapper<CrisisNote> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DeathDiscussionMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.DeathDiscussion;
+
+/**
+ * <p>
+ * 表名：str_death_discussion Mapper接口
+ * </p>
+ */
+public interface DeathDiscussionMapper extends BaseMapper<DeathDiscussion> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DeathNoteMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.DeathNote;
+
+/**
+ * <p>
+ * 表名：str_death_note Mapper接口
+ * </p>
+ */
+public interface DeathNoteMapper extends BaseMapper<DeathNote> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DeptInfoMapper.java

@@ -1,8 +1,12 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.dto.report.BasDeptInfoDTO;
+import com.lantone.common.vo.report.BasDeptInfoVO;
 import com.lantone.dblayermbg.entity.report.DeptInfo;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名：bas_dept_info Mapper接口
@@ -10,4 +14,5 @@ import com.lantone.dblayermbg.entity.report.DeptInfo;
  */
 
 public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
+    List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DifficultCaseMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.DifficultCase;
+
+/**
+ * <p>
+ * 表名：str_difficult_case Mapper接口
+ * </p>
+ */
+public interface DifficultCaseMapper extends BaseMapper<DifficultCase> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DoctorAdviceMapper.java

@@ -1,7 +1,14 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.DoctorAdviceDTO;
+import com.lantone.common.vo.report.DoctorAdviceVO;
 import com.lantone.dblayermbg.entity.report.DoctorAdvice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -9,5 +16,6 @@ import com.lantone.dblayermbg.entity.report.DoctorAdvice;
  * </p>
  */
 public interface DoctorAdviceMapper extends BaseMapper<DoctorAdvice> {
-
+    IPage<DoctorAdviceDTO> getPage(@Param("doctorAdviceVO") DoctorAdviceVO doctorAdviceVO, @Param("infos") Set<String> infos);
+    List<String> getInfo(@Param("hospitalId")Long hospitalId, @Param("behospitalCode")String behospitalCode);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/FirstRecordMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.FirstRecord;
+
+/**
+ * <p>
+ * 表名：str_first_record Mapper接口
+ * </p>
+ */
+public interface FirstRecordMapper extends BaseMapper<FirstRecord> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/IllCriticallyMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.IllCritically;
+
+/**
+ * <p>
+ * 表名：str_ill_critically Mapper接口
+ * </p>
+ */
+public interface IllCriticallyMapper extends BaseMapper<IllCritically> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/IllSeriouslMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.IllSeriousl;
+
+/**
+ * <p>
+ * 表名：str_ill_seriousl Mapper接口
+ * </p>
+ */
+public interface IllSeriouslMapper extends BaseMapper<IllSeriousl> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/IndexResultMapper.java

@@ -1,7 +1,11 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.vo.report.FilterVO;
 import com.lantone.dblayermbg.entity.report.IndexResult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -9,5 +13,13 @@ import com.lantone.dblayermbg.entity.report.IndexResult;
  * </p>
  */
 public interface IndexResultMapper extends BaseMapper<IndexResult> {
+    /**
+     * 指标分母人数
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Double> medicalRecordIndicator(@Param("filterVO") FilterVO filterVO);
+
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/InformedConsentMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.InformedConsent;
+
+/**
+ * <p>
+ * 表名：str_informed_consent Mapper接口
+ * </p>
+ */
+public interface InformedConsentMapper extends BaseMapper<InformedConsent> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/LeaveHospitalMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.LeaveHospital;
+
+/**
+ * <p>
+ * 表名：str_leave_hospital Mapper接口
+ * </p>
+ */
+public interface LeaveHospitalMapper extends BaseMapper<LeaveHospital> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/LisInfoMapper.java

@@ -1,7 +1,17 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.ExamineInfoDTO;
+import com.lantone.common.dto.report.ExamineSonInfoDTO;
+import com.lantone.common.vo.report.ExamineInfoVO;
+import com.lantone.common.vo.report.ExamineSonInfoVO;
 import com.lantone.dblayermbg.entity.report.LisInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -9,5 +19,13 @@ import com.lantone.dblayermbg.entity.report.LisInfo;
  * </p>
  */
 public interface LisInfoMapper extends BaseMapper<LisInfo> {
+    Map<String, Object> getTime(@Param("behospitalCode") String behospitalCode);
+
+    List<String> getBadExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos);
+
+    IPage<ExamineInfoDTO> getExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos, @Param("badCheckInfo") List<String> badCheckInfo);
+
+    List<String> getInfo(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
 
+    IPage<ExamineSonInfoDTO> getExamineSonInfo(@Param("examineSonInfoVO") ExamineSonInfoVO examineSonInfoVO, @Param("infos") Set<String> infos);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/MedicalRecordMapper.java

@@ -1,13 +1,17 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.dto.report.MedicalRecordDTO;
+import com.lantone.common.vo.report.RecordTypeVO;
 import com.lantone.dblayermbg.entity.report.MedicalRecord;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名：med_medical_record Mapper接口
  * </p>
  */
 public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
-
+    List<MedicalRecordDTO> getMedicalRecord(RecordTypeVO recordContentVO);
 }