Merge branch 'dev/20210917_v3.2_老版本功能迁移' into dev/20220105_2.2.0_通用版_申诉驳回

common/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>common</artifactId>
     <name>common</name>
     <packaging>jar</packaging>
+    <description>工具类及通用代码模块</description>
 
     <dependencies>
         <dependency>
@@ -34,11 +35,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
-            <version> 4.2.0</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -93,15 +89,10 @@
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.4.0</version>
+            <version>${java-jwt.version}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

common/src/main/java/com/lantone/common/api/ResultCode.java

@@ -11,33 +11,7 @@ public enum ResultCode implements IErrorCode {
     FAILED(500, "操作失败"),
     VALIDATE_FAILED(404, "参数检验失败"),
     UNAUTHORIZED(401, "暂未登录或token已经过期"),
-    FORBIDDEN(403, "没有相关权限"),
-//    OK(0, "操作成功"),
-//    FAIL(00000001, "操作失败"),
-//    RPC_ERROR(00000002, "远程调度失败"),
-//    CHECK_CONNECTION(00000005, "是否解除绑定"),
-//    SAVE_SUCCESSFUL(00000007, "添加成功"),
-//    ALTER_SUCCESSFUL(00000009, "修改成功"),
-//    PARAM_ERROR(00029999, "%s"),
-//    NOT_EXISTS(00020001, "该数据不存在!"),
-//    INSERT_DATA_FAILED(00020002, "数据库写入失败!"),
-//    UPDATE_INFO_FAIL(00020003, "更新数据失败!"),
-//    PARAM_IS_NULL(0002000, "传入的参数为空!"),
-//    PARAM_IS_ERROR(00020005, "传入的参数为错误!"),
-//    STATUS_IS_ERROR(00020006, "参数状态错误!"),
-    SERVER_IS_ERROR(00020007, "各自业务错误!");
-//    NO_PERMISSION(00020008, "无权访问!"),
-//    IS_EXISTS(00020009, "已存在!"),
-//    ANALYZER_TOKEN_FAIL(10020010, "解析token失败"),
-//    TOKEN_PAST(10020011, "token已失效，请重新登录"),
-//    SECURITYCODE_ERROR(20020001, "防伪码错误"),
-//    APPKEY_ERROR(20020002, "appkey或secret错误"),
-//    PRODUCT_STOP_ERROR(20020003, "该产品已停用"),
-//    OVERDUE_ERROR(20020004, "访问权限已过期"),
-//    NOPERMISSION_ERROR(20020005, "无权限访问"),
-//    SERVICE_STOP_ERROR(20020006, "当前服务已停用"),
-//    NOTVALID_ERROR(20020007, "该产品未在有效服务期内，无法使用"),
-//    EXPIRE_ERROR(20020008, "该产品已超出有效服务期，无法使用");
+    FORBIDDEN(403, "没有相关权限");
 
     private long code;
     private String message;

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

@@ -1,172 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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/DeptDTO.java

@@ -1,51 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 科室返回对象
- * @Author songxl
- * @Date 2021/7/22
- */
-@Data
-public class DeptDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院科室编码")
-    private String code;
-
-    @ApiModelProperty(value = "科室名称")
-    private String name;
-
-    @ApiModelProperty(value = "类别")
-    private String type;
-
-    @ApiModelProperty(value = "首字母拼音")
-    private String spell;
-
-    @ApiModelProperty(value = "区域类别")
-    private String station;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "创建用户编号")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    private String isDeleted;
-    @ApiModelProperty(value = "关联标志位 1 关联")
-    private String relation = "0";
-}

common/src/main/java/com/lantone/common/dto/GetHospitalDeptDTO.java

@@ -1,36 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 医院科室信息对象
- * </p>
- */
-@Data
-public class GetHospitalDeptDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long hospitalId;
-
-    private Long parentId;
-
-
-    @ApiModelProperty(value = "名称")
-    private String hospitalName;
-
-    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
-    private String type;
-
-    @ApiModelProperty(value = "科室编号")
-    private Long deptId;
-    @ApiModelProperty(value = "科室名称")
-    private String deptName;
-    @ApiModelProperty(value = "是否关联")
-    private String relation;
-}

common/src/main/java/com/lantone/common/dto/GetSoftwareMenuDTO.java

@@ -1,23 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 系统服务菜单返回对象
- */
-@Data
-public class GetSoftwareMenuDTO {
-    @ApiModelProperty(value = "编号")
-    private Long softwareId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String softwareName;
-    @ApiModelProperty(value = "已关联或未关联")
-    private String softwareRelation;
-
-    @ApiModelProperty(value = "服务菜单列表")
-    private List<SoftwareMenuRelationDTO> menus;
-}

common/src/main/java/com/lantone/common/dto/HospitalDTO.java

@@ -1,64 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 用户组织对象
- * </p>
- */
-@Data
-public class HospitalDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long id;
-
-    private Long parentId;
-
-    @ApiModelProperty(value = "医院编码")
-    private String orgCode;
-
-    @ApiModelProperty(value = "父级编码")
-    private String parentCode;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "归属区域")
-    private String region;
-
-    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
-    private String type;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "状态 0:禁用，1：启用")
-    private String status;
-
-    @ApiModelProperty(value = "创建者编号")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    private String isDeleted;
-
-
-    @ApiModelProperty(value = "用户在该组织下的角色列表")
-    private List<RoleDTO> roles;
-    @ApiModelProperty(value = "该医院的科室列表")
-    private List<DeptDTO> depts;
-
-    @ApiModelProperty(value = "该虚拟医院的医院列表")
-    private List<HospitalDTO> hospitalDTOS;
-    @ApiModelProperty(value = "关联标志位 1 关联")
-    private String relation = "0";
-}

common/src/main/java/com/lantone/common/dto/MenuInfoDTO.java

@@ -1,98 +0,0 @@
-package com.lantone.common.dto;
-
-
-
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName: MenuDTO
- * @Description: 用户菜单对象
- * @Author songxl
- * @Date 2021/7/19
- * @Version 1.0
- */
-@Data
-public class MenuInfoDTO {
-    /**
-     * 编号
-     */
-    private Long id;
-
-    /**
-     * 父级编号
-     */
-    private Long parentId;
-
-    /**
-     * 系统id
-     */
-    private Long systemId;
-
-    /**
-     * 功能名称
-     */
-    private String name;
-
-    /**
-     * 类型：0:目录，1菜单，2按钮，3：功能
-     */
-    private String type;
-
-    /**
-     * 页面路由
-     */
-    private String url;
-
-    /**
-     * 权限标识
-     */
-    private String permission;
-
-    /**
-     * 图标
-     */
-    private String icon;
-
-    /**
-     * 排序
-     */
-    private String orderNo;
-
-    /**
-     * 状态 0:禁用，1：启用
-     */
-    private String status;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建用户编号
-     */
-    private Long creator;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private List<MenuInfoDTO> children;
-}

common/src/main/java/com/lantone/common/dto/SoftwareMenuRelationDTO.java

@@ -1,31 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 系统服务菜单关联关系对象
- */
-@Data
-public class SoftwareMenuRelationDTO {
-    @ApiModelProperty(value = "编号")
-    private Long softwareId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String softwareName;
-
-    @ApiModelProperty(value = "编号")
-    private Long menuId;
-    @ApiModelProperty(value = "父级编号")
-    private Long parentId;
-
-    @ApiModelProperty(value = "功能名称")
-    private String menuName;
-
-    @ApiModelProperty(value = "菜单已关联或未关联")
-    private String menuRelation;
-    @ApiModelProperty(value = "子系统服务菜单关联关系对象")
-    private  List<SoftwareMenuRelationDTO> children;
-}

common/src/main/java/com/lantone/common/dto/SysRegionDTO.java

@@ -1,67 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 病区表
- * </p>
- */
-@Data
-public class SysRegionDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院名称")
-    @NotBlank
-    private String hospitalName;
-
-    @ApiModelProperty(value = "联系人")
-    @NotBlank
-    private String liaison;
-
-    @ApiModelProperty(value = "手机号码")
-    @NotBlank
-    private String phoneNumber;
-
-    @ApiModelProperty(value = "病区编码")
-    private String code;
-
-    @ApiModelProperty(value = "病区名称")
-    @NotBlank
-    private String name;
-
-    @ApiModelProperty(value = "首字母拼音")
-    private String spell;
-
-    @ApiModelProperty(value = "区域类别")
-    @NotBlank
-    private String station;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "关联科室id")
-    private List<Long> deptIds;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "0-否 1-是")
-    private Integer status;
-
-    @ApiModelProperty(value = "0-非禁用校验标识 1-禁用校验标识 2-禁用此病区")
-    private Integer mark = 0;
-
-
-}

common/src/main/java/com/lantone/common/dto/UserPermissionDTO.java

@@ -1,24 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 菜单功能DTO
- * </p>
- */
-@Data
-public class UserPermissionDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long id;
-
-    @ApiModelProperty(value = "资源权限")
-    private String permission;
-
-}

common/src/main/java/com/lantone/common/dto/analyze/AlgorithmDTO.java

@@ -1,20 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/14 13:07
- */
-@Getter
-@Setter
-public class AlgorithmDTO {
-    //得分
-    private BigDecimal score;
-    //等级
-    private String level;
-}

common/src/main/java/com/lantone/common/dto/analyze/AnalyzeDTO.java

@@ -1,35 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/15 12:24
- */
-@Data
-public class AnalyzeDTO {
-    // 病历id
-    private String behospitalCode;
-    //是否成功
-    private Boolean isSuccess;
-    //得分
-    private BigDecimal scoreRes;
-    //等级
-    private String level;
-    /**
-     * 评分类型(1：机器，2：人工)
-     */
-    private Integer gradeType;
-    /**
-     * 评分类型名称(1：机器，2：人工)
-     */
-    private String gradeTypeName;
-
-    /**
-     * 评分时间
-     */
-    private Date gradeTime;
-}

common/src/main/java/com/lantone/common/dto/analyze/BasDeptInfoDTO.java

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 18:56
- */
-@Getter
-@Setter
-public class BasDeptInfoDTO {
-    /**
-     * 科室编码（HIS导入）
-     */
-    private String deptId;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-}

common/src/main/java/com/lantone/common/dto/analyze/BehospitalInfoDTO.java

@@ -1,134 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 住院病历信息
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class BehospitalInfoDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 性别
-     */
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date birthday;
-
-    /**
-     * 档案号
-     */
-    private String fileCode;
-
-    /**
-     * 病区名称
-     */
-    private String wardName;
-
-    /**
-     * 住院科室名称
-     */
-    private String behDeptName;
-
-    /**
-     * 床位号
-     */
-    private String bedCode;
-
-    /**
-     * 入院时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-
-    /**
-     * 疾病名称
-     */
-    private String diagnose;
-
-    /**
-     * 医生姓名
-     */
-    private String doctorName;
-
-    /**
-     * 年龄
-     */
-    private String age;
-
-    /**
-     * 病历等级
-     */
-    private String level;
-
-    /**
-     * 最后得分
-     */
-    private Double scoreRes;
-
-    /**
-     * 病案首页得分
-     */
-    private Double scoreBn;
-
-    /**
-     * 评分类型(1：机器，2：人工)
-     */
-    private String gradeType;
-
-    /**
-     * 评分时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date gradeTime;
-
-    private String directorDoctorName ;
-
-    private String behDoctorName;
-
-    /**
-     * 归档时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date placefileDate;
-
-    private Integer checkStatus;
-    private Integer mrStatus;
-    private String chName;
-    private String mrName;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date chTime;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date mrTime;
-}

common/src/main/java/com/lantone/common/dto/analyze/Constants.java

@@ -1,159 +0,0 @@
-/**   
-* @Company: 杭州朗通信息技术有限公司 
-* @Department: 系统软件部 
-* @Description: 朗通智能辅助诊疗系统 
-* @Address: 浙江省杭州市西湖区西斗门路3号 天堂软件园D-7B 
-*/
-package com.lantone.common.dto.analyze;
-
-/**
-* @Title: Constants.java 
-* @Package org.diagbot.public 
-* @Description: 通用常数接口定义  
-* @author 楼辉荣(Fyeman)   
-* @date 2015年4月23日 下午11:25:37 
-* @version V1.0
- */
-public interface Constants {
-    /**
-     * 操作名称
-     */
-    String OP_NAME = "op";
-    /**
-     * 消息key
-     */
-    String MESSAGE = "message";
-    /**
-     * 错误key
-     */
-    String ERROR = "error";
-    /**
-     * 上个页面地址
-     */
-    String BACK_URL = "BackURL";
-    String IGNORE_BACK_URL = "ignoreBackURL";
-    /**
-     * 当前请求的地址 带参数
-     */
-    String CURRENT_URL = "currentURL";
-    /**
-     * 当前请求的地址 不带参数
-     */
-    String NO_QUERYSTRING_CURRENT_URL = "noQueryStringCurrentURL";
-    /**
-     * 上下文
-     */
-    String CONTEXT_PATH = "ctx";
-    /**
-     * 当前登录的用户
-     */
-    String CURRENT_APPLICATION = "c_app";
-    String CURRENT_USER = "c_user";
-    String CURRENT_USERNAME = "username";
-    String USER_MENUS = "menus";
-    
-    /**
-     * 管理控制台应用ID=0
-     */
-    long ADMIN_APPLICATION = 0;
-    /**
-     * 一级菜单grade标识
-     */
-    int FIRST_MENU = 1;
-    /**
-     * 二级菜单grade标识
-     */
-    int SECOND_MENU = 2;
-    /**
-     * 操作按钮等级标识
-     */
-    int MENU_GRADE = 3;
-    /**
-     * 最高级资源grade标识
-     */
-    int TOP_REC = 0;
-    /**
-     * 编码方式
-     */
-    String ENCODING = "UTF-8";
-    /**
-     * 系统用户状态--启用
-     */
-    int USER_STATUS_UNLOCK = 1;
-    /**
-     * 系统用户状态--禁用
-     */
-    int USER_STATUS_LOCK = 0;
-    /**
-     * 通用值0
-     */
-    int COMMON_INT_0 = 0;
-    /**
-     * 通用值1
-     */
-    int COMMON_INT_1 = 1;
-    /**
-     * 通用值-1
-     */
-    int COMMON_INT_NEG_1 = -1;
-    /**
-     * 通用值0
-     */
-    long COMMON_LONG_0 = 0L;
-    /**
-     * 通用值1
-     */
-    long COMMON_LONG_1 = 1L;
-    /**
-     * 通用值-1
-     */
-    long COMMON_LONG_NEG_1 = -1L;
-    /**
-     * 通用值"0"
-     */
-    String COMMON_STRING_0 = "0";
-    /**
-     * 通用值"1"
-     */
-    String COMMON_STRING_1 = "1";
-    /**
-     * 通用值"-1"
-     */
-    String COMMON_STRING_NEG_1 = "-1";
-    
-    /**
-     * 通用值"-1"
-     */
-    String COMMON_STRING_99 = "99";
-    /**
-     * 登录页面
-     */
-    String LOGIN_URL = "/login";
-    /**
-     * 上传文件夹
-     */
-    String UPLOAD_FOLDER_NAME = "upload";
-    /**
-     * 临时文件夹
-     */
-    String TEMP_FOLDER_NAME = "temp";
-    /**
-     * 地域标示
-     */
-    public static final String DEFAULT_LOCALE = "zh_CN";
-    /**
-     * 缺省字符集
-     */
-    public static final String DEFAULT_ENCODE = "UTF-8";
-    /**
-     * 以下为接口返回公共属性定义常量
-     */
-    public static final String MSG_SUCCESS = "操作成功";	//操作成功
-    public static final String MSG_FALURE = "操作失败";	//操作失败
-    
-    public static final long INVALIDATE_VALUE = -1;		//起止时间定义
-    public static final int RET_SUCCESS = 0; 			//成功
-	public static final int RET_FAIL = 1; 				//失败
-	public static final int RET_ERROR_PARAM = -1; 		//参数校验失败
-	public static final int RET_NO_TOKEN = -2; 	//用户token丢失
-}

common/src/main/java/com/lantone/common/dto/analyze/MedLisResultDTO.java

@@ -1,318 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-08-04
- */
-public class MedLisResultDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    private Integer hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 报告代码
-     */
-    private String itemCode;
-
-    /**
-     * medLisResult报告名称
-     */
-    private String reportName;
-
-    /**
-     * medLisInfo报告名称
-     */
-    private String repName;
-
-    /**
-     * 报告名称
-     */
-    private String itemName;
-
-    /**
-     * 检验结果
-     */
-    private String result;
-
-    /**
-     * 参考值
-     */
-    private String reference;
-
-    /**
-     * 最小参考值
-     */
-    private String referenceMin;
-
-    /**
-     * 最大参考值
-     */
-    private String referenceMax;
-
-    /**
-     * 单位
-     */
-    private String unit;
-
-    /**
-     * 异常标志
-     */
-    private String abnormal;
-
-    /**
-     * 异常颜色
-     */
-    private String color;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    public MedLisResultDTO(String repNo, Integer hospitalId, String behospitalCode, String itemCode, String reportName, String repName, String itemName, String result, String reference, String referenceMin, String referenceMax, String unit, String abnormal, String color, String isDeleted, LocalDateTime gmtCreate, LocalDateTime gmtModified, String creator, String modifier) {
-        this.repNo = repNo;
-        this.hospitalId = hospitalId;
-        this.behospitalCode = behospitalCode;
-        this.itemCode = itemCode;
-        this.reportName = reportName;
-        this.repName = repName;
-        this.itemName = itemName;
-        this.result = result;
-        this.reference = reference;
-        this.referenceMin = referenceMin;
-        this.referenceMax = referenceMax;
-        this.unit = unit;
-        this.abnormal = abnormal;
-        this.color = color;
-        this.isDeleted = isDeleted;
-        this.gmtCreate = gmtCreate;
-        this.gmtModified = gmtModified;
-        this.creator = creator;
-        this.modifier = modifier;
-    }
-
-    public MedLisResultDTO() {
-    }
-
-    public void setRepNo(String repNo) {
-        this.repNo = repNo;
-    }
-
-    public void setHospitalId(Integer hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-
-    public void setItemCode(String itemCode) {
-        this.itemCode = itemCode;
-    }
-
-    public void setReportName(String reportName) {
-        this.reportName = reportName;
-    }
-
-    public void setRepName(String repName) {
-        this.repName = repName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public void setReference(String reference) {
-        this.reference = reference;
-    }
-
-    public void setReferenceMin(String referenceMin) {
-        this.referenceMin = referenceMin;
-    }
-
-    public void setReferenceMax(String referenceMax) {
-        this.referenceMax = referenceMax;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public void setAbnormal(String abnormal) {
-        this.abnormal = abnormal;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getRepNo() {
-        return repNo;
-    }
-
-    public Integer getHospitalId() {
-        return hospitalId;
-    }
-
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public String getItemCode() {
-        return itemCode;
-    }
-
-    public String getReportName() {
-        return reportName;
-    }
-
-    public String getRepName() {
-        return repName;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public String getReference() {
-        return reference;
-    }
-
-    public String getReferenceMin() {
-        return referenceMin;
-    }
-
-    public String getReferenceMax() {
-        return referenceMax;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public String getAbnormal() {
-        return abnormal;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "MedLisResultDTO{" +
-                "repNo='" + repNo + '\'' +
-                ", hospitalId=" + hospitalId +
-                ", behospitalCode='" + behospitalCode + '\'' +
-                ", itemCode='" + itemCode + '\'' +
-                ", reportName='" + reportName + '\'' +
-                ", repName='" + repName + '\'' +
-                ", itemName='" + itemName + '\'' +
-                ", result='" + result + '\'' +
-                ", reference='" + reference + '\'' +
-                ", referenceMin='" + referenceMin + '\'' +
-                ", referenceMax='" + referenceMax + '\'' +
-                ", unit='" + unit + '\'' +
-                ", abnormal='" + abnormal + '\'' +
-                ", color='" + color + '\'' +
-                ", isDeleted='" + isDeleted + '\'' +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator='" + creator + '\'' +
-                ", modifier='" + modifier + '\'' +
-                '}';
-    }
-}

common/src/main/java/com/lantone/common/dto/analyze/MedPacsResultDTO.java

@@ -1,110 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-08-04
- */
-@Data
-public class MedPacsResultDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 报告名称
-     */
-    private String reptName;
-
-    /**
-     * 检查部位
-     */
-    private String part;
-
-    /**
-     * 检查所见
-     */
-    private String clinicSight;
-
-    /**
-     * 检查结果诊断
-     */
-    private String reptDiag;
-
-    /**
-     * 观察记录
-     */
-    private String remark;
-
-    /**
-     * 临床诊断
-     */
-    private String clinicDiag;
-
-    /**
-     * 申请医生
-     */
-    private String applyDoctor;
-
-    /**
-     * 审核医生
-     */
-    private String checkerDoctor;
-
-    /**
-     * 报告医生
-     */
-    private String reportDoctor;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-}

common/src/main/java/com/lantone/common/dto/analyze/MedicalRecordDTO.java

@@ -1,48 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class MedicalRecordDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-    /**
-     * 病人医院ID
-     */
-    private Long hospitalId;
-    /**
-     * 模块id
-     */
-    private Long modeId;
-
-    /**
-     * 病历标题
-     */
-    private String recTitle;
-
-    /**
-     * 病历日期
-     */
-    private String recDate;
-
-    /**
-     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
-     */
-    private int isParsed = 0;
-
-}

common/src/main/java/com/lantone/common/dto/analyze/OutputInfo.java

@@ -1,28 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @ClassName : OutputInfo
- * @Description : 返回对象
- * @Author : 楼辉荣
- * @Date: 2020-03-04 15:50
- */
-@Setter
-@Getter
-public class OutputInfo {
-    /**
-     * 如
-     * {
-     * "BEH001":{"status":"-1", "info": "发热"}
-     * }
-     */
-    private Map<String, Map<String, String>> result = new HashMap<>();
-    //后结构化数据
-    private Map<String, Object> pageData = new HashMap<>();
-
-}

common/src/main/java/com/lantone/common/dto/analyze/QcCasesEntryDTO.java

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/13 20:13
- */
-@Data
-public class QcCasesEntryDTO {
-    /**
-     * 数据模块ID-对应qc_mode.id
-     */
-    private Long modeId;
-
-    private String code;
-
-    private String msg;
-
-    private String precond;
-
-}

common/src/main/java/com/lantone/common/dto/analyze/QcModeDTO.java

@@ -1,41 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 病历
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-15
- */
-@Data
-public class QcModeDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 模块名称
-     */
-    private String name;
-
-    /**
-     * 模块名称
-     */
-    private Long parentId;
-
-    /**
-     * 子级模块
-     */
-    List<QcModeDTO> sonMode = new ArrayList<>();
-}

common/src/main/java/com/lantone/common/dto/analyze/RePlaceData.java

@@ -1,19 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * @Description:
- * @Author: cy
- * @Date: 2020/10/14 14:15
- */
-@Getter
-@Setter
-public class RePlaceData {
-    private String recId ;     //病历id
-    private Long hospitalId;   //医院id
-    private String jsonData ;     //结构化大字段
-
-}

common/src/main/java/com/lantone/common/dto/analyze/RecordContentDTO.java

@@ -1,84 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 住院病历信息
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class RecordContentDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 标准模块名称
-     */
-    private String standModelName;
-
-    /**
-     * 内容
-     */
-    private String contentText;
-
-    /**
-     * html内容
-     */
-    private String htmlText;
-    /**
-     * xml内容
-     */
-    private String xmlText;
-
-    /**
-     * 加密信息
-     */
-    private String contentBlob;
-
-    /**
-     * 医院文书标题
-     */
-    private String recTitle;
-
-    /**
-     * 医院文书id
-     */
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 病历类别编号
-     */
-    private String recTypeId;
-
-    /**
-     * 模块id
-     */
-    private Long modeId;
-
-    /**
-     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
-     */
-    private int isParsed = 0;
-    /**
-     *转出时间集合-qc作判断
-     */
-    List<LocalDateTime> transferOutDate = new ArrayList<>();
-    /**
-     *转入时间集合-qc作判断
-     */
-    List<LocalDateTime> transferInDate = new ArrayList<>();
-}

common/src/main/java/com/lantone/common/dto/analyze/Response.java

@@ -1,192 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-//import com.lantone.pub.Constants;
-
-/**
- * 
- * ClassName: org.diagbot.pub.api.Response 
- * Function: API接口提供标准返回数据包, 数据包格式如下：
- * 			{
- * 				status:"OK",
- * 				startTime:8206448610408,
- * 				endTime:8206448610418,
- * 				version:"1.0",
- * 				msg:"操作成功",
- * 				ret:"0",
- *				timeConsum:10,
- *				data:{
- *					..。		
- *				}
- * 			}
- * date: 2015年7月6日 下午1:36:58  
- * 
- * @author 楼辉荣(Fyeman) 
- * @version 1.0 
- * @since JDK 1.7
- */
-public class Response<T> implements java.io.Serializable {
-	private static final long serialVersionUID = 8206448610408409499L;
-	private Status status =  Status.PENDING;  //状态
-    private long startTime = Constants.INVALIDATE_VALUE;                                  //起始时间
-    private long endTime = Constants.INVALIDATE_VALUE;                                    //结束时间
-    private String version="1.0";
-    private String msg = Constants.MSG_SUCCESS;                                  //消息
-    private T data = null;                                                                //序列化后的结果数据
-    // 返回结果标志，默认成功0,失败 1 参数错误 -1 token丢失-2
-    private int ret = Constants.RET_SUCCESS;
-    
-    private String token;
-    //耗时
- 	private long timeConsum;
- 	
-    public int getRet() {
-		return ret;
-	}
-
-	public void setRet(int ret) {
-		this.ret = ret;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	public long getTimeConsum() {
-		return timeConsum;
-	}
-
-	public void setTimeConsum(long timeConsum) {
-		this.timeConsum = timeConsum;
-	}
-
-	public Response(){
-        super();
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
-    /**
-     * 在调用end()方法时，会自动设置状态，因此，如果调用了end()方法，就不要调用这个方法
-     * @param status
-     */
-    public Response<T> setStatus(Status status) {
-        this.status = status;
-        return this;
-    }
-
- 
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public long getStartTime() {
-        return startTime;
-    }
-
-    public Response<T> setStartTime(long startTime) {
-        this.startTime = startTime;
-        return this;
-    }
-
-    public long getEndTime() {
-        return endTime;
-    }
-
-    public Response<T> setEndTime(long endTime) {
-        this.endTime = endTime;
-        return this;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-
-	/**
-     * 设置状态和起始时间，表示操作正在进行
-     */
-    public Response<T> start(){
-        this.setStatus(Status.RUNNING);
-        this.setStartTime(System.currentTimeMillis());
-        return this;
-    }
-
-    /**
-     * 设置状态和时间，表示操作结束，没有失败
-     */
-    public Response<T> end(){
-        this.setEndTime(System.currentTimeMillis());
-        this.setTimeConsum(this.endTime-this.startTime);
-		this.setStatus(Status.OK);
-        return this;
-    }
-
-    /**
-     * 设置状态和时间，表示操作结束，并且失败
-     */
-    public Response<T> endAndFailed(){
-        this.setStatus(Status.FAIL);
-        this.setEndTime(System.currentTimeMillis());
-        return this;
-    }
-    
-    /**
-     * 非参数错误通用失败信息
-     */
-    public Response<T> failure(String msg) {
-    	this.msg = msg;
-    	this.ret = Constants.RET_FAIL;
-    	this.end();
-    	return this;
-    }
-    
-    /**
-     * 参数错误信息
-     */
-    public Response<T> paramFailure(String msg) {
-    	this.msg = msg;
-    	this.ret = Constants.RET_ERROR_PARAM;
-    	this.end();
-    	return this;
-    }
-    
-    /**
-     * 用户信息丢失
-     */
-    public Response<T> tokenFailure(String msg) {
-    	this.msg = msg;
-    	this.ret = Constants.RET_NO_TOKEN;
-    	this.end();
-    	return this;
-    }
-    
-    /**
-     * 通用成功
-     */
-    public Response<T> success() {
-    	this.end();
-    	return this;
-    }
-
-}

common/src/main/java/com/lantone/common/dto/analyze/Status.java

@@ -1,131 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-public enum Status {
-	/**
-	 * <code>PENDING = 1;</code>
-	 *
-	 * <pre>
-	 * 操作尚未开始
-	 * </pre>
-	 */
-	PENDING(1),
-	/**
-	 * <code>RUNNING = 2;</code>
-	 *
-	 * <pre>
-	 * 操作开始
-	 * </pre>
-	 */
-	RUNNING(2),
-	/**
-	 * <code>OK = 3;</code>
-	 *
-	 * <pre>
-	 * 操作正常结束
-	 * </pre>
-	 */
-	OK(3),
-	/**
-	 * <code>WARN = 4;</code>
-	 *
-	 * <pre>
-	 * 有警告，但是正常结束
-	 * </pre>
-	 */
-	WARN(4),
-	/**
-	 * <code>ERROR = 5;</code>
-	 *
-	 * <pre>
-	 * 有错误，但是完整结束
-	 * </pre>
-	 */
-	ERROR(5),
-	/**
-	 * <code>FAIL = 6;</code>
-	 *
-	 * <pre>
-	 * 操作失败
-	 * </pre>
-	 */
-	FAIL(6), ;
-
-	/**
-	 * <code>PENDING = 1;</code>
-	 *
-	 * <pre>
-	 * 操作尚未开始
-	 * </pre>
-	 */
-	public static final int PENDING_VALUE = 1;
-	/**
-	 * <code>RUNNING = 2;</code>
-	 *
-	 * <pre>
-	 * 操作开始
-	 * </pre>
-	 */
-	public static final int RUNNING_VALUE = 2;
-	/**
-	 * <code>OK = 3;</code>
-	 *
-	 * <pre>
-	 * 操作正常结束
-	 * </pre>
-	 */
-	public static final int OK_VALUE = 3;
-	/**
-	 * <code>WARN = 4;</code>
-	 *
-	 * <pre>
-	 * 有警告，但是正常结束
-	 * </pre>
-	 */
-	public static final int WARN_VALUE = 4;
-	/**
-	 * <code>ERROR = 5;</code>
-	 *
-	 * <pre>
-	 * 有错误，但是完整结束
-	 * </pre>
-	 */
-	public static final int ERROR_VALUE = 5;
-	/**
-	 * <code>FAIL = 6;</code>
-	 *
-	 * <pre>
-	 * 操作失败
-	 * </pre>
-	 */
-	public static final int FAIL_VALUE = 6;
-
-	public final int getNumber() {
-		return value;
-	}
-
-	public static Status valueOf(int value) {
-		switch (value) {
-		case 1:
-			return PENDING;
-		case 2:
-			return RUNNING;
-		case 3:
-			return OK;
-		case 4:
-			return WARN;
-		case 5:
-			return ERROR;
-		case 6:
-			return FAIL;
-		default:
-			return null;
-		}
-	}
-
-	private final int value;
-
-	private Status(int value) {
-		this.value = value;
-	}
-
-}

common/src/main/java/com/lantone/common/dto/analyze/SysUserPagesetDTO.java

@@ -1,33 +0,0 @@
-package com.lantone.common.dto.analyze;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/12 10:26
- */
-@Getter
-@Setter
-public class SysUserPagesetDTO {
-    /**
-     * 列名
-     */
-    private String name;
-
-    /**
-     * 列名值
-     */
-    private String val;
-
-    /**
-     * 是否启用(0:停用，1：启用)
-     */
-    private Integer status;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-}

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

@@ -1,25 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/12/24 13:07
- */
-@Getter
-@Setter
-public class AdmissionCountDTO {
-    //医生id
-    private String doctorId;
-    //主管医生
-    private String doctorName;
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    //总人数
-    private Integer num;
-}

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

@@ -1,20 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/14 13:07
- */
-@Getter
-@Setter
-public class AlgorithmDTO {
-    //得分
-    private BigDecimal score;
-    //等级
-    private String level;
-}

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

@@ -1,38 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/15 12:24
- */
-@Getter
-@Setter
-public class AnalyzeDTO {
-    // 病历id
-    private String behospitalCode;
-    //是否成功
-    private Boolean isSuccess;
-    //得分
-    private BigDecimal scoreRes;
-    //等级
-    private String level;
-    /**
-     * 评分类型(1：机器，2：人工)
-     */
-    private Integer gradeType;
-    /**
-     * 评分类型名称(1：机器，2：人工)
-     */
-    private String gradeTypeName;
-
-    /**
-     * 评分时间
-     */
-    private Date gradeTime;
-}

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

@@ -1,28 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description:
- * @author: zhoutg
- * @time: 2020/4/15 12:24
- */
-@Getter
-@Setter
-public class AnalyzeRunDTO {
-    //得分
-    private BigDecimal scoreRes;
-    //等级
-    private String level;
-    //缺陷总数
-    private Long num;
-    //缺陷总扣分
-    private BigDecimal numScore;
-    // 缺陷条目
-    private List<MsgDTO> msgDTOList = new ArrayList<>();
-}

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

@@ -1,31 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 19:44
- */
-@Getter
-@Setter
-public class AverageStatisticsDTO {
-    private String id;
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String name;
-    private Integer num = 0;
-    private Integer sameNum = 0; //同期num
-    @Excel(name = "本年平均住院天数（天）", width = 15, orderNum = "2")
-    private Double averageValue = 0d;
-    private Double totleValue = 0d;
-    private Double sameTotleValue = 0d;
-    //环比平均值
-    @Excel(name = "去年平均住院天数（天）", width = 15, orderNum = "3")
-    private Double lastAverageValue = 0d;
-    //同比平均值
-    private Double lastYearAverageValue = 0d;
-    //科室分类
-    private String deptClass;
-}

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

@@ -1,29 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 19:44
- */
-@Getter
-@Setter
-public class AverageStatisticsFeeDTO {
-    private String id;
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String name;
-    private Integer num;
-    @Excel(name = "本年平均住院花费（元）", width = 15, orderNum = "2")
-    private Double averageValue = 0d;
-    private Double totleValue = 0d;
-    //环比平均值
-    @Excel(name = "去年平均住院花费（元）", width = 15, orderNum = "3")
-    private Double lastAverageValue = 0d;
-    //同比平均值
-    private Double lastYearAverageValue = 0d;
-    //科室分类
-    private String deptClass;
-}

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

@@ -1,30 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 19:44
- */
-@Getter
-@Setter
-public class AverageStatisticsFeeMonthDTO {
-    private String id;
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String name;
-    private Integer num;
-    @Excel(name = "本月平均住院花费（元）", width = 15, orderNum = "2")
-    private Double averageValue = 0d;
-    private Double totleValue = 0d;
-    //环比平均值
-    @Excel(name = "上月平均住院花费（元）", width = 15, orderNum = "3")
-    private Double lastAverageValue = 0d;
-    //同比平均值
-    @Excel(name = "去年本月平均住院花费（元）", width = 15, orderNum = "4")
-    private Double lastYearAverageValue = 0d;
-    //科室分类
-    private String deptClass;
-}

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

@@ -1,30 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 19:44
- */
-@Getter
-@Setter
-public class AverageStatisticsMonthDTO {
-    private String id;
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String name;
-    private Integer num;
-    @Excel(name = "本月平均住院天数（天）", width = 15, orderNum = "2")
-    private Double averageValue = 0d;
-    private Double totleValue = 0d;
-    //环比平均值
-    @Excel(name = "上月平均住院天数（天）", width = 15, orderNum = "3")
-    private Double lastAverageValue = 0d;
-    //同比平均值
-    @Excel(name = "去年本月平均住院天数（天）", width = 15, orderNum = "4")
-    private Double lastYearAverageValue = 0d;
-    //科室分类
-    private String deptClass;
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 18:56
- */
-@Getter
-@Setter
-public class BasDeptInfoDTO {
-    /**
-     * 科室编码（HIS导入）
-     */
-    private String deptId;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-}

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

@@ -1,38 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/12 11:37
- */
-@Getter
-@Setter
-public class BasHospitalInfoDTO {
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 医院名称
-     */
-    private String name;
-
-    /**
-     * 组织机构代码
-     */
-    private String code;
-
-    /**
-     * 医院名称拼音
-     */
-    private String spell;
-
-    /**
-     * 医院地址
-     */
-    private String address;
-}

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

@@ -1,86 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 住院病历信息
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class BehosDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 性别
-     */
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    private Date birthday;
-
-    /**
-     * 档案号
-     */
-    private String fileCode;
-
-    /**
-     * 病区名称
-     */
-    private String wardName;
-
-    /**
-     * 住院科室名称
-     */
-    private String behDeptName;
-
-    /**
-     * 床位号
-     */
-    private String bedCode;
-
-    /**
-     * 入院时间
-     */
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    private Date leaveHospitalDate;
-
-    /**
-     * 疾病名称
-     */
-    private String diagnose;
-
-    /**
-     * 医生姓名
-     */
-    private String doctorName;
-
-    /**
-     * 年龄
-     */
-    private String age;
-
-}

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

@@ -1,28 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: wangsy
- * @time: 2021/5/13 15:00
- */
-@Getter
-@Setter
-public class BehospitalInfoAgeDTO {
-
-    /**
-     * 病人住院序号
-     */
-    private String behospitalCode;
-
-    /**
-     * 年龄
-     */
-    private String age;
-    private String ageYear;
-    private String ageMon;
-    private String ageDay;
-
-}

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

@@ -1,134 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 住院病历信息
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class BehospitalInfoDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 性别
-     */
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date birthday;
-
-    /**
-     * 档案号
-     */
-    private String fileCode;
-
-    /**
-     * 病区名称
-     */
-    private String wardName;
-
-    /**
-     * 住院科室名称
-     */
-    private String behDeptName;
-
-    /**
-     * 床位号
-     */
-    private String bedCode;
-
-    /**
-     * 入院时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-
-    /**
-     * 疾病名称
-     */
-    private String diagnose;
-
-    /**
-     * 医生姓名
-     */
-    private String doctorName;
-
-    /**
-     * 年龄
-     */
-    private String age;
-
-    /**
-     * 病历等级
-     */
-    private String level;
-
-    /**
-     * 最后得分
-     */
-    private Double scoreRes;
-
-    /**
-     * 病案首页得分
-     */
-    private Double scoreBn;
-
-    /**
-     * 评分类型(1：机器，2：人工)
-     */
-    private String gradeType;
-
-    /**
-     * 评分时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date gradeTime;
-
-    private String directorDoctorName ;
-
-    private String behDoctorName;
-
-    /**
-     * 归档时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date placefileDate;
-
-    private Integer checkStatus;
-    private Integer mrStatus;
-    private String chName;
-    private String mrName;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date chTime;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date mrTime;
-}

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

@@ -1,18 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/28 14:49
- */
-@Getter
-@Setter
-public class CaseAndDeptNumDTO extends NumDTO {
-    private String deptId;
-    private String deptName;
-    private Long casesId;
-    private String casesName;
-}

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

@@ -1,16 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/28 14:45
- */
-@Getter
-@Setter
-public class CaseNumDTO extends NumDTO {
-    private Long casesId;
-    private String casesName;
-}

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

@@ -1,35 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: zhoutg
- * @time: 2020/4/14 13:07
- */
-@Getter
-@Setter
-public class CaseScoreDTO {
-
-    //得分
-    private Double score;
-    //提示信息
-    private String msg;
-    //提示信息
-    private String info;
-    //单项否决
-    private String isReject;
-    //模块名称
-    private String modelName;
-    //模块id
-    private String modelId;
-    private String behospitalCode;
-    //模块ID
-    private Long casesId;
-    //模块分数
-    private Double casesScore;
-    // 条目ID
-    private Long casesEntryId;
-
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 核查科室输出类
- * @Author:songxl
- * @time: 2021/5/14 13:45
- */
-@Getter
-@Setter
-public class CheckDeptDTO {
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    //科室质控人员列表
-    private List<DeptCheckUserDTO> deptcheckUsers = new ArrayList<>();
-}

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

@@ -1,65 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/03 15:00
- */
-@Getter
-@Setter
-public class CheckInfoDTO {
-
-    /**
-     * 检查类型判别
-     */
-    private String checkItemType;
-
-    /**
-     * 检查项目名称
-     */
-    private String checkItemName;
-
-    /**
-     * 检查结果
-     */
-    private String checkResult;
-
-    /**
-     * 检查时间
-     */
-    private Date checkTime;
-
-    /**
-     * 报告时间
-     */
-    private Date reptTime;
-
-    /**
-     * 入院时间
-     */
-    @JsonIgnore
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @JsonIgnore
-    private Date leaveHospitalDate;
-
-    /**
-     * 开单医生
-     */
-    private String doctorName;
-
-    /**
-     * 质检提示信息
-     */
-    @JsonIgnore
-    private String info;
-}

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

@@ -1,39 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 科室核查人员输出类
- * @Author:songxl
- * @time: 2021/5/14 13:45
- */
-@Getter
-@Setter
-public class CheckJobDTO {
-    //核查任务id
-    private int id;
-    //病人住院序号
-    private String behospitalCode;
-    //病人姓名
-    private String name;
-    //科室
-    private String behospitalDept;
-    //主管医生
-    private String attendingDoctor;
-    //出院日期
-    private String leaveHospitalDate;
-    //核查任务生成时间
-    private String jobCreateTime;
-    //任务分配人员id
-    private Long jobDistributor;
-    //任务分配人员名称
-    private String jobDistributorName;
-    //科室id
-    private String behospitalDeptId;
-
-    //筛选分值
-    private int value;
-    //取消分配标志
-    private Boolean delFlag;
-}

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

@@ -1,24 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 核查人员用户科室、姓名、角色输出类
- * @Author:songxl
- * @time: 2021/5/14 13:45
- */
-@Getter
-@Setter
-public class CheckUserDTO {
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    //医生id
-    private String doctorId;
-    //医生名称
-    private String doctorName;
-    //角色id
-    private int roleId;
-}

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

@@ -1,122 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: wangsy
- * @time: 2021/5/13 15:00
- */
-@Getter
-@Setter
-public class CheckWorkDTO {
-
-    /**
-     * 病人住院序号
-     */
-    private String behospitalCode;
-
-    /**
-     * 病人姓名
-     */
-    private String name;
-
-
-    /**
-     * 病案号
-     */
-    private String fileCode;
-
-    /**
-     * 性别
-     */
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    private String age;
-    private String ageYear;
-    private String ageMon;
-    private String ageDay;
-
-    /**
-     * 科室
-     */
-    private String behDeptName;
-
-    /**
-     * 出院日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-
-    /**
-     * 住院天数
-     */
-    private String behospitalDayNum;
-
-    /**
-     * 主管医生
-     */
-    private String doctorName;
-
-    /**
-     * 病历等级
-     */
-    private String level;
-
-    /**
-     * 病历得分
-     */
-    private String scoreRes;
-
-    /**
-     * 主诊断
-     */
-    private String diagnose;
-
-    /**
-     * 筛选分值
-     */
-    private String score;
-
-    /**
-     * 生成状态
-     */
-    private String creatStatus;
-
-    /**
-     * 生成日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date jobCreateTime;
-
-    /**
-     * 核查任务生成人编号
-     */
-    private Long jobCreator;
-    /**
-     * 核查任务生成人
-     */
-    private String jobCreatorName;
-
-    /**
-     * 核查日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date checkTime;
-
-    /**
-     * 分配日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date jobDistributionTime;
-
-    //取消分配标志
-    private Boolean delFlag = false;
-}

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

@@ -1,140 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description:
- * @author: rengb
- * @time: 2021/5/17 18:47
- */
-@Getter
-@Setter
-@ApiModel("核查任务列表-获取核查任务列表-接口出参")
-public class CheckedRecordListDTO {
-
-    /**
-     * 病人住院序号
-     */
-    @ApiModelProperty("病人住院序号")
-    private String behospitalCode;
-
-    /**
-     * 病历核查状态
-     */
-    @ApiModelProperty("病历核查状态")
-    private String status;
-
-    /**
-     * 科室Id
-     */
-    @ApiModelProperty("科室Id")
-    private String behDeptId;
-    /**
-     * 任务来源
-     */
-    @ApiModelProperty("任务来源")
-    private String jobTypeName;
-
-    /**
-     * 科室
-     */
-    @ApiModelProperty("科室")
-    private String behDeptName;
-
-    /**
-     * 病人姓名
-     */
-    @ApiModelProperty("病人姓名")
-    private String name;
-
-    /**
-     * 病案号
-     */
-    @ApiModelProperty("病案号")
-    private String fileCode;
-
-    /**
-     * 主管医生
-     */
-    @ApiModelProperty("主管医生")
-    private String doctorName;
-
-    /**
-     * 出院日期
-     */
-    @ApiModelProperty("出院日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-
-    /**
-     * 生成日期
-     */
-    @ApiModelProperty("生成日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date jobCreateTime;
-
-    /**
-     * 分配日期
-     */
-    @ApiModelProperty("分配日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date jobDistributionTime;
-
-    /**
-     * 任务月份
-     */
-    @ApiModelProperty("任务月份")
-    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
-    private Date month;
-
-    /**
-     * 核查员id
-     */
-    @ApiModelProperty("核查员id")
-    private Long checkId;
-
-    /**
-     * 核查员
-     */
-    @ApiModelProperty("核查员")
-    private String checkName;
-
-    /**
-     * 核查日期
-     */
-    @ApiModelProperty("核查日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date checkTime;
-
-    /**
-     * 缺陷数
-     */
-    @ApiModelProperty("缺陷数")
-    private int casesEntryNum;
-
-    /**
-     * 病历等级
-     */
-    @ApiModelProperty("病历等级")
-    private String level;
-
-    /**
-     * 病历得分
-     */
-    @ApiModelProperty("病历得分")
-    private BigDecimal scoreRes;
-
-    /**
-     * 年龄
-     */
-    @ApiModelProperty("年龄")
-    private String age;
-
-}

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

@@ -1,20 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/13 17:37
- */
-@Getter
-@Setter
-public class ColumnDTO {
-    private Long id;
-    private String columnName;
-    private String fieldName;
-    private Integer orderNo;
-    private String fieldType;
-    private Integer isShow;
-}

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

@@ -1,159 +0,0 @@
-/**   
-* @Company: 杭州朗通信息技术有限公司 
-* @Department: 系统软件部 
-* @Description: 朗通智能辅助诊疗系统 
-* @Address: 浙江省杭州市西湖区西斗门路3号 天堂软件园D-7B 
-*/
-package com.lantone.common.dto.report;
-
-/**
-* @Title: Constants.java 
-* @Package org.diagbot.public 
-* @Description: 通用常数接口定义  
-* @author 楼辉荣(Fyeman)   
-* @date 2015年4月23日 下午11:25:37 
-* @version V1.0
- */
-public interface Constants {
-    /**
-     * 操作名称
-     */
-    String OP_NAME = "op";
-    /**
-     * 消息key
-     */
-    String MESSAGE = "message";
-    /**
-     * 错误key
-     */
-    String ERROR = "error";
-    /**
-     * 上个页面地址
-     */
-    String BACK_URL = "BackURL";
-    String IGNORE_BACK_URL = "ignoreBackURL";
-    /**
-     * 当前请求的地址 带参数
-     */
-    String CURRENT_URL = "currentURL";
-    /**
-     * 当前请求的地址 不带参数
-     */
-    String NO_QUERYSTRING_CURRENT_URL = "noQueryStringCurrentURL";
-    /**
-     * 上下文
-     */
-    String CONTEXT_PATH = "ctx";
-    /**
-     * 当前登录的用户
-     */
-    String CURRENT_APPLICATION = "c_app";
-    String CURRENT_USER = "c_user";
-    String CURRENT_USERNAME = "username";
-    String USER_MENUS = "menus";
-    
-    /**
-     * 管理控制台应用ID=0
-     */
-    long ADMIN_APPLICATION = 0;
-    /**
-     * 一级菜单grade标识
-     */
-    int FIRST_MENU = 1;
-    /**
-     * 二级菜单grade标识
-     */
-    int SECOND_MENU = 2;
-    /**
-     * 操作按钮等级标识
-     */
-    int MENU_GRADE = 3;
-    /**
-     * 最高级资源grade标识
-     */
-    int TOP_REC = 0;
-    /**
-     * 编码方式
-     */
-    String ENCODING = "UTF-8";
-    /**
-     * 系统用户状态--启用
-     */
-    int USER_STATUS_UNLOCK = 1;
-    /**
-     * 系统用户状态--禁用
-     */
-    int USER_STATUS_LOCK = 0;
-    /**
-     * 通用值0
-     */
-    int COMMON_INT_0 = 0;
-    /**
-     * 通用值1
-     */
-    int COMMON_INT_1 = 1;
-    /**
-     * 通用值-1
-     */
-    int COMMON_INT_NEG_1 = -1;
-    /**
-     * 通用值0
-     */
-    long COMMON_LONG_0 = 0L;
-    /**
-     * 通用值1
-     */
-    long COMMON_LONG_1 = 1L;
-    /**
-     * 通用值-1
-     */
-    long COMMON_LONG_NEG_1 = -1L;
-    /**
-     * 通用值"0"
-     */
-    String COMMON_STRING_0 = "0";
-    /**
-     * 通用值"1"
-     */
-    String COMMON_STRING_1 = "1";
-    /**
-     * 通用值"-1"
-     */
-    String COMMON_STRING_NEG_1 = "-1";
-    
-    /**
-     * 通用值"-1"
-     */
-    String COMMON_STRING_99 = "99";
-    /**
-     * 登录页面
-     */
-    String LOGIN_URL = "/login";
-    /**
-     * 上传文件夹
-     */
-    String UPLOAD_FOLDER_NAME = "upload";
-    /**
-     * 临时文件夹
-     */
-    String TEMP_FOLDER_NAME = "temp";
-    /**
-     * 地域标示
-     */
-    public static final String DEFAULT_LOCALE = "zh_CN";
-    /**
-     * 缺省字符集
-     */
-    public static final String DEFAULT_ENCODE = "UTF-8";
-    /**
-     * 以下为接口返回公共属性定义常量
-     */
-    public static final String MSG_SUCCESS = "操作成功";	//操作成功
-    public static final String MSG_FALURE = "操作失败";	//操作失败
-    
-    public static final long INVALIDATE_VALUE = -1;		//起止时间定义
-    public static final int RET_SUCCESS = 0; 			//成功
-	public static final int RET_FAIL = 1; 				//失败
-	public static final int RET_ERROR_PARAM = -1; 		//参数校验失败
-	public static final int RET_NO_TOKEN = -2; 	//用户token丢失
-}

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

@@ -1,16 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/8 19:11
- */
-@Getter
-@Setter
-public class DeptBaseDTO {
-    private String deptId;
-    private String deptName;
-}

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

@@ -1,26 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 科室核查人员输出类
- * @Author:songxl
- * @time: 2021/5/14 13:45
- */
-@Getter
-@Setter
-public class DeptCheckUserDTO {
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    //医生id
-    private String doctorId;
-    //医生名称
-    private String doctorName;
-    //核查数
-    private int jobNum;
-    private int checkNum;
-    private int status;
-}

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

@@ -1,75 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/6/5 14:26
- */
-@Getter
-@Setter
-public class DeptEntryNumDTO {
-    /**
-     * 条目缺陷id
-     */
-
-    private Long id;
-    /**
-     * 条目缺陷名称
-     */
-    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
-    private String name;
-    /**
-     * 模块id
-     */
-    private Long casesId;
-    /**
-     * 模块名称
-     */
-    @Excel(name = "模块名称", width = 20, orderNum = "1")
-    private String casesName;
-    /**
-     * 科室id
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 条目缺陷总数
-     */
-    private Integer totleNum = 0;
-    /**
-     * 条目缺陷数
-     */
-    @Excel(name = "数量", orderNum = "5")
-    private Integer num = 0;
-    /**
-     * 条目缺陷占比
-     */
-
-    private Double percent = 0.00d;
-    /**
-     * 条目缺陷占比（百分比）
-     */
-    @Excel(name = "缺陷占比", orderNum = "6")
-    private String percentStr = "0.00%";
-    /**
-     * 条目缺陷分值
-     */
-    @Excel(name = "分值", orderNum = "3")
-    private Double score = 0d;
-    /**
-     * 单项否决标识
-     */
-    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
-    private Integer isReject;
-    /**
-     * 规则类型(0：无，1：空项，2：错误)
-     */
-    private Integer ruleType;
-}

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

@@ -1,22 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/8 20:02
- */
-@Getter
-@Setter
-public class DeptNumDTO extends NumDTO {
-    /**
-     * 科室id
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-}

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

@@ -1,140 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/7/13 15:00
- */
-@Getter
-@Setter
-public class DoctorAdviceDTO {
-    private String doctorAdviceId;
-
-    /**
-     * 医院id
-     */
-    private Long hospitalId;
-
-    /**
-     * 病人ID
-     */
-    private String behospitalCode;
-
-//    /**
-//     * 医生开单判别
-//     */
-//    private String orderDoctorName;
-//
-//    /**
-//     * 医嘱频率判别
-//     */
-//    private String frequency;
-//
-//    /**
-//     * 父类医嘱ID
-//     */
-//    private String parentTypeId;
-
-    /**
-     * 医嘱类型判别(嘱托长嘱、长期医嘱等)
-     */
-    private String doctorAdviceType;
-
-//    /**
-//     * 一次使用数量
-//     */
-//    private String usageNum;
-//
-//    /**
-//     * 一次用量单位
-//     */
-//    private String usageUnit;
-//
-    /**
-     * 医嘱单次剂量
-     */
-    private String dose;
-
-    /**
-     * 单次剂量单位
-     */
-    private String doseUnit;
-
-    /**
-     * 给药方式
-     */
-    private String medModeType;
-
-    /**
-     * 医嘱频率
-     */
-    private String daFrequency;
-//
-//    /**
-//     * 医嘱处理类型
-//     */
-//    private String daDealType;
-
-    /**
-     * 医嘱开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date daStartDate;
-
-    /**
-     * 医嘱项目名称
-     */
-    private String daItemName;
-
-//    /**
-//     * 医嘱状态判别
-//     */
-//    private String daStatus;
-
-    /**
-     * 医嘱结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date daStopDate;
-
-//    /**
-//     * 医嘱同组序号
-//     */
-//    private String daGroupNo;
-
-    /**
-     * 医嘱处方类型(检验、描述医嘱、膳食、西药、护理等)
-     */
-    private String daPrescriptionType;
-
-    /**
-     * 药品类型(0.普药 1.抗生素 2.激素)
-     */
-    private String medicineType;
-
-//    /**
-//     * 医嘱领药类型
-//     */
-//    private String daMedType;
-//
-//    /**
-//     * 医生嘱托
-//     */
-//    private String doctorNotice;
-//
-//    /**
-//     * 开单医生ID
-//     */
-//    private String doctorId;
-
-    /**
-     * 开单医生姓名
-     */
-    private String doctorName;
-}

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

@@ -1,62 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:条目缺陷占比返回结构
- * @Author:zhaops
- * @time: 2020/6/5 13:20
- */
-@Getter
-@Setter
-public class EntryNumDTO {
-    /**
-     * 条目缺陷id
-     */
-    private Long id;
-    /**
-     * 条目缺陷名称
-     */
-    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
-    private String name;
-    /**
-     * 模块id
-     */
-    private Long casesId;
-    /**
-     * 模块名称
-     */
-    @Excel(name = "模块名称", width = 20, orderNum = "1")
-    private String casesName;
-    /**
-     * 条目缺陷总数
-     */
-    private Integer totleNum = 0;
-    /**
-     * 条目缺陷数
-     */
-    @Excel(name = "数量", orderNum = "5")
-    private Integer num = 0;
-
-    /**
-     * 条目缺陷占比（百分比）
-     */
-    @Excel(name = "缺陷占比", orderNum = "6")
-    private String percentStr = "0.00%";
-    /**
-     * 条目缺陷分值
-     */
-    @Excel(name = "分值", orderNum = "3")
-    private Double score = 0d;
-    /**
-     * 单项否决标识
-     */
-    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
-    private Integer isReject;
-    /**
-     * 规则类型(0：无，1：空项，2：错误)
-     */
-    private Integer ruleType;
-}

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

@@ -1,63 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:条目缺陷占比返回结构
- * @Author:zhaops
- * @time: 2020/6/5 13:20
- */
-@Getter
-@Setter
-public class EntryNumGroupDTO {
-    /**
-     * 条目缺陷id
-     */
-    private Long id;
-    /**
-     * 条目缺陷名称
-     */
-    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
-    private String name;
-    /**
-     * 模块id
-     */
-    private Long casesId;
-    /**
-     * 模块名称
-     */
-    @Excel(name = "模块名称", width = 20, orderNum = "1")
-    private String casesName;
-    /**
-     * 条目缺陷总数
-     */
-    private Integer totleNum = 0;
-    /**
-     * 条目缺陷数
-     */
-    @Excel(name = "数量", orderNum = "3")
-    private Integer num = 0;
-    /**
-     * 条目缺陷占比
-     */
-    private Double percent = 0.00d;
-    /**
-     * 条目缺陷占比（百分比）
-     */
-    @Excel(name = "缺陷占比", orderNum = "4")
-    private String percentStr = "0.00%";
-    /**
-     * 条目缺陷分值
-     */
-    private Double score = 0d;
-    /**
-     * 单项否决标识
-     */
-    private Integer isReject;
-    /**
-     * 规则类型(0：无，1：空项，2：错误)
-     */
-    private Integer ruleType;
-}

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

@@ -1,177 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/6/18 20:17
- */
-@Getter
-@Setter
-public class EntryStasByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 主治医生
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "1")
-    private String doctorName;
-    /**
-     * 未在24小时内完成会诊数
-     */
-    @Excel(name = "未在24小时内完成会诊数", width = 15, orderNum = "2")
-    private Integer consultationNum = 0;
-    /**
-     * 未在24小时内完成会诊条目id
-     */
-    private Long consultationEntryId = 2511L;
-    /**
-     * 未在24小时内完成会诊条目名称
-     */
-    private String consultationEntryName = "普通会诊未在24小时内完成";
-    /**
-     * 未在24小时内完成会诊率
-     */
-    private Double consultationPercent = 0.00d;
-    /**
-     * 未在24小时内完成会诊率（百分比）
-     */
-    @Excel(name = "未在24小时内完成会诊率", width = 15, orderNum = "3")
-    private String consultationPercentStr = "0.00%";
-    /**
-     * 会诊病历数
-     */
-    private Integer consultationMRNum = 0;
-    /**
-     * 手术记录名称不匹配条目id
-     */
-    private Long operationNameEntryId = 2594L;
-    /**
-     * 手术记录名称不匹配条目名称
-     */
-    private String operationNameEntryName = "首页手术名称与手术记录不一致";
-    /**
-     * 手术记录名称不匹配数
-     */
-    @Excel(name = "手术记录名称不匹配数", width = 15, orderNum = "4")
-    private Integer operationNameNum = 0;
-    /**
-     * 手术记录名称不匹配率
-     */
-    private Double operationNamePercent = 0.00d;
-    /**
-     * 手术记录名称不匹配率（百分比）
-     */
-    @Excel(name = "手术记录名称不匹配率", width = 15, orderNum = "5")
-    private String operationNamePercentStr = "0.00%";
-    /**
-     * 术后首程未在15分钟内完成条目id
-     */
-    private Long operation15MinuteEntryId = 2930L;
-    /**
-     * 术后首程未在15分钟内完成条目名称
-     */
-    private String operation15MinuteEntryName = "术后首次病程未即刻完成";
-    /**
-     * 术后首程未在15分钟内完成数
-     */
-    @Excel(name = "术后首程未在15分钟内完成数", width = 15, orderNum = "6")
-    private Integer operation15MinuteNum = 0;
-    /**
-     * 术后首程未在15分钟内完成率
-     */
-    private Double operation15MinutePercent = 0.00d;
-    /**
-     * 术后首程未在15分钟内完成率（百分比）
-     */
-    @Excel(name = "术后首程未在15分钟内完成率", width = 15, orderNum = "7")
-    private String operation15MinutePercentStr = "0.00%";
-    /**
-     * 病案首页手术时间不匹配条目id
-     */
-    private Long operationTimeEntryId = 2973L;
-    /**
-     * 病案首页手术时间不匹配条目名称
-     */
-    private String operationTimeEntryName = "手术日期与手术记录中手术日期不一致";
-    /**
-     * 病案首页手术时间不匹配数
-     */
-    @Excel(name = "病案首页手术时间不匹配数", width = 15, orderNum = "8")
-    private Integer operationTimeNum = 0;
-    /**
-     * 病案首页手术时间不匹配率
-     */
-    private Double operationTimePercent = 0.00;
-    /**
-     * 病案首页手术时间不匹配率（百分比）
-     */
-    @Excel(name = "病案首页手术时间不匹配率", width = 15, orderNum = "9")
-    private String operationTimePercentStr = "0.00%";
-    /**
-     * 手术记录病历数
-     */
-    private Integer operationMRNum = 0;
-    /**
-     * 未在6小时内书写危急值条目id
-     */
-    private Long crisisEntryId = 2419L;
-    /**
-     * 未在6小时内书写危急值条目名称
-     */
-    private String crisisEntryName = "危急值记录未在接到危急值报告后6小时内完成";
-    /**
-     * 未在6小时内书写危急值记录数
-     */
-    @Excel(name = "未在6小时内书写危急值记录数", width = 15, orderNum = "10")
-    private Integer crisisNum = 0;
-    /**
-     * 未在6小时内书写危急值记录率
-     */
-    private Double crisisPercent = 0.00d;
-    /**
-     * 未在6小时内书写危急值记录率（百分比）
-     */
-    @Excel(name = "未在6小时内书写危急值记录率", width = 15, orderNum = "11")
-    private String crisisPercentStr = "0.00%";
-    /**
-     * 危急值记录病历数
-     */
-    private Integer crisisMRNum = 0;
-    /**
-     * 住院超过31日病人数
-     */
-    @Excel(name = "住院超过31日病人数", width = 15, orderNum = "12")
-    private Integer beHosGT31DaysMRNum;
-    /**
-     * 阶段小节未书写条目id
-     */
-    private Long stageSummaryEntryId = 2495L;
-    /**
-     * 阶段小节未书写条目名称
-     */
-    private String stageSummaryEntryName = "无阶段小结";
-    /**
-     * 阶段小节未书写数
-     */
-    @Excel(name = "阶段小节未书写数", width = 15, orderNum = "13")
-    private Integer stageSummaryNum = 0;
-    /**
-     * 阶段小节未书写率
-     */
-    private Double stageSummaryPercent = 0.00d;
-    /**
-     * 阶段小节未书写率（百分比）
-     */
-    @Excel(name = "阶段小节未书写率", width = 15, orderNum = "14")
-    private String stageSummaryPercentStr = "0.00%";
-    /**
-     * 病人住院超过30天的病历数
-     */
-    private Integer stageSummaryMRNum = 0;
-}

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

@@ -1,177 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/6/18 20:17
- */
-@Getter
-@Setter
-public class EntryStatisticsDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String deptName;
-    /**
-     * 未在24小时内完成会诊数
-     */
-    @Excel(name = "未在24小时内完成会诊数", width = 15, orderNum = "2")
-    private Integer consultationNum = 0;
-    /**
-     * 未在24小时内完成会诊条目id
-     */
-    private Long consultationEntryId = 2511L;
-    /**
-     * 未在24小时内完成会诊条目名称
-     */
-    private String consultationEntryName = "普通会诊未在24小时内完成";
-    /**
-     * 未在24小时内完成会诊率
-     */
-    private Double consultationPercent = 0.00d;
-    /**
-     * 未在24小时内完成会诊率（百分比）
-     */
-    @Excel(name = "未在24小时内完成会诊率", width = 15, orderNum = "3")
-    private String consultationPercentStr = "0.00%";
-    /**
-     * 会诊病历数
-     */
-    private Integer consultationMRNum = 0;
-    /**
-     * 手术记录名称不匹配条目id
-     */
-    private Long operationNameEntryId = 2594L;
-    /**
-     * 手术记录名称不匹配条目名称
-     */
-    private String operationNameEntryName = "首页手术名称与手术记录不一致";
-    /**
-     * 手术记录名称不匹配数
-     */
-    @Excel(name = "手术记录名称不匹配数", width = 15, orderNum = "4")
-    private Integer operationNameNum = 0;
-    /**
-     * 手术记录名称不匹配率
-     */
-    private Double operationNamePercent = 0.00d;
-    /**
-     * 手术记录名称不匹配率（百分比）
-     */
-    @Excel(name = "手术记录名称不匹配率", width = 15, orderNum = "5")
-    private String operationNamePercentStr = "0.00%";
-    /**
-     * 术后首程未在15分钟内完成条目id
-     */
-    private Long operation15MinuteEntryId = 2930L;
-    /**
-     * 术后首程未在15分钟内完成条目名称
-     */
-    private String operation15MinuteEntryName = "术后首次病程未即刻完成";
-    /**
-     * 术后首程未在15分钟内完成数
-     */
-    @Excel(name = "术后首程未在15分钟内完成数", width = 15, orderNum = "6")
-    private Integer operation15MinuteNum = 0;
-    /**
-     * 术后首程未在15分钟内完成率
-     */
-    private Double operation15MinutePercent = 0.00d;
-    /**
-     * 术后首程未在15分钟内完成率（百分比）
-     */
-    @Excel(name = "术后首程未在15分钟内完成率", width = 15, orderNum = "7")
-    private String operation15MinutePercentStr = "0.00%";
-    /**
-     * 病案首页手术时间不匹配条目id
-     */
-    private Long operationTimeEntryId = 2973L;
-    /**
-     * 病案首页手术时间不匹配条目名称
-     */
-    private String operationTimeEntryName = "手术日期与手术记录中手术日期不一致";
-    /**
-     * 病案首页手术时间不匹配数
-     */
-    @Excel(name = "病案首页手术时间不匹配数", width = 15, orderNum = "8")
-    private Integer operationTimeNum = 0;
-    /**
-     * 病案首页手术时间不匹配率
-     */
-    private Double operationTimePercent = 0.00;
-    /**
-     * 病案首页手术时间不匹配率（百分比）
-     */
-    @Excel(name = "病案首页手术时间不匹配率", width = 15, orderNum = "9")
-    private String operationTimePercentStr = "0.00%";
-    /**
-     * 手术记录病历数
-     */
-    private Integer operationMRNum = 0;
-    /**
-     * 未在6小时内书写危急值条目id
-     */
-    private Long crisisEntryId = 2419L;
-    /**
-     * 未在6小时内书写危急值条目名称
-     */
-    private String crisisEntryName = "危急值记录未在接到危急值报告后6小时内完成";
-    /**
-     * 未在6小时内书写危急值记录数
-     */
-    @Excel(name = "未在6小时内书写危急值记录数", width = 15, orderNum = "10")
-    private Integer crisisNum = 0;
-    /**
-     * 未在6小时内书写危急值记录率
-     */
-    private Double crisisPercent = 0.00d;
-    /**
-     * 未在6小时内书写危急值记录率（百分比）
-     */
-    @Excel(name = "未在6小时内书写危急值记录率", width = 15, orderNum = "11")
-    private String crisisPercentStr = "0.00%";
-    /**
-     * 危急值记录病历数
-     */
-    private Integer crisisMRNum = 0;
-    /**
-     * 住院超过31日病人数
-     */
-    @Excel(name = "住院超过31日病人数", width = 15, orderNum = "12")
-    private Integer beHosGT31DaysMRNum;
-    /**
-     * 阶段小节未书写条目id
-     */
-    private Long stageSummaryEntryId = 2495L;
-    /**
-     * 阶段小节未书写条目名称
-     */
-    private String stageSummaryEntryName = "无阶段小结";
-    /**
-     * 阶段小节未书写数
-     */
-    @Excel(name = "阶段小节未书写数", width = 15, orderNum = "13")
-    private Integer stageSummaryNum = 0;
-    /**
-     * 阶段小节未书写率
-     */
-    private Double stageSummaryPercent = 0.00d;
-    /**
-     * 阶段小节未书写率（百分比）
-     */
-    @Excel(name = "阶段小节未书写率", width = 15, orderNum = "14")
-    private String stageSummaryPercentStr = "0.00%";
-    /**
-     * 病人住院超过30天的病历数
-     */
-    private Integer stageSummaryMRNum = 0;
-}

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

@@ -1,77 +0,0 @@
-package com.lantone.common.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/07 15:00
- */
-@Getter
-@Setter
-public class ExamineInfoDTO {
-    /**
-     * 医院id
-     */
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    private String behospitalCode;
-
-    /**
-     * 检验类型判别
-     */
-    private String examineItemType;
-
-    /**
-     * 检验项目名称
-     */
-    private String examineItemName;
-
-
-
-    /**
-     * 返回检查时间
-     */
-    private Date checkTime;
-
-
-    /**
-     * 返回报告时间
-     */
-    private Date reptTime;
-
-    /**
-     * 入院时间
-     */
-    @JsonIgnore
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @JsonIgnore
-    private Date leaveHospitalDate;
-
-    /**
-     * 开单医生
-     */
-    private String doctorName;
-
-    /**
-     * 报告单号
-     */
-    private String repNo;
-
-    /**
-     * 质检提示信息
-     */
-    @JsonIgnore
-    private String info;
-}

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

@@ -1,42 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/07 15:00
- */
-@Getter
-@Setter
-public class ExamineSonInfoDTO {
-    /**
-     * 检验项目名称
-     */
-    private String examineItemName;
-
-    /**
-     * 检验结果
-     */
-    private String examineItemResult;
-
-    /**
-     * 返回检验时间
-     */
-    private Date checkTime;
-
-
-    /**
-     * 返回报告时间
-     */
-    private Date reptTime;
-
-    /**
-     * 开单医生
-     */
-    private String doctorName;
-
-}

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

@@ -1,34 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:35
- */
-@Getter
-@Setter
-public class ExportExcelBehByDeptDTO {
-    @Excel(name = "患者姓名", needMerge = true)
-    private String patName;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
-    @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date behospitalDate;
-    @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date leaveHospitalDate;
-    @Excel(name = "分数", needMerge = true)
-    private Double score;
-    @Excel(name = "病案首页分数", needMerge = true)
-    private Double scoreBn;
-    @ExcelCollection(name = "")
-    private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
-
-}

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

@@ -1,36 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:35
- */
-@Getter
-@Setter
-public class ExportExcelBehospitalDTO {
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "患者姓名", needMerge = true)
-    private String patName;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
-    @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date behospitalDate;
-    @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date leaveHospitalDate;
-    @Excel(name = "分数", needMerge = true)
-    private Double score;
-    @Excel(name = "病案首页分数", needMerge = true)
-    private Double scoreBn;
-    @ExcelCollection(name = "")
-    private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
-
-}

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

@@ -1,28 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportExcelByDeptDTO {
-//    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "")
-    private List<ExportExcelBehByDeptDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,9 +0,0 @@
-package com.lantone.common.dto.report;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:47
- */
-public class ExportExcelCase {
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:47
- */
-@Getter
-@Setter
-public class ExportExcelCaseDTO {
-    @Excel(name = "模块名称", needMerge = true)
-    private String caseName;
-    @ExcelCollection(name = "")
-    private List<ExportExcelMsgDTO> exportExcelMsgDTOS;
-
-}

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

@@ -1,26 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportExcelDTO {
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "")
-    private List<ExportExcelBehospitalDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,17 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:47
- */
-@Getter
-@Setter
-public class ExportExcelMsgDTO {
-    @Excel(name = "存在问题", isWrap = false)
-    private String msg;
-}

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

@@ -1,29 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:35
- */
-@Getter
-@Setter
-public class ExportExcelWideBehByDeptDTO {
-    @Excel(name = "患者姓名", needMerge = true)
-    private String patName;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
-    @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date behospitalDate;
-    @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date leaveHospitalDate;
-    @Excel(name = "分数", needMerge = true)
-    private Double score;
-    @Excel(name = "病案首页分数", needMerge = true)
-    private Double scoreBn;
-}

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

@@ -1,31 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:35
- */
-@Getter
-@Setter
-public class ExportExcelWideBehospitalDTO {
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "患者姓名", needMerge = true)
-    private String patName;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
-    @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date behospitalDate;
-    @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date leaveHospitalDate;
-    @Excel(name = "分数", needMerge = true)
-    private Double score;
-    @Excel(name = "病案首页分数", needMerge = true)
-    private Double scoreBn;
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportNinetyByDeptDTO {
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @ExcelCollection(name = "")
-    private List<ExportWideExcelByDeptDTO> exportExcelByDeptDTOS;
-
-}

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

@@ -1,58 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/6/2 19:57
- */
-@Getter
-@Setter
-public class ExportQcresultDTO {
-    /**
-     * 科室编码/科室id
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 主管医生名称（主任医生+主治医生）
-     */
-    private String doctorName;
-    /**
-     * 患者姓名
-     */
-    private String patientName;
-    /**
-     * 病历号
-     */
-    private String behospitalCode;
-    /**
-     * 入院日期
-     */
-    private String behospitalDate;
-    /**
-     * 出院日期
-     */
-    private String leaveHospitalDate;
-    /**
-     * 质控评分
-     */
-    private Double scoreRes;
-    /**
-     * 科室质控平均分
-     */
-    private Double averageScore;
-    /**
-     * 存在问题
-     */
-    private String msg;
-    /**
-     * 错误所属区块
-     */
-    private String casesName;
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportSevenByDeptDTO {
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @ExcelCollection(name = "")
-    private List<ExportExcelByDeptDTO> exportExcelByDeptDTOS;
-
-}

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

@@ -1,28 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportWideExcelByDeptDTO {
-//    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "" )
-    private List<ExportExcelWideBehByDeptDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,26 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportWideExcelDTO {
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "" )
-    private List<ExportExcelWideBehospitalDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,29 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/28 17:11
- */
-@Setter
-@Getter
-public class GetModuleInfoOneDTO {
-    //模板id
-    private Long id;
-    //模板名称
-    private String name;
-    //医院ID
-    private Long hospitalId;
-    //数据模块ID
-    private Long modeId;
-    //数据模块名称
-    private String modeName;
-    //模板明细
-    private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
-}

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

@@ -1,118 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:病案首页合格率占比返回结构
- * @Author:zhaops
- * @time: 2020/6/5 17:32
- */
-@Getter
-@Setter
-public class HomePageByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "1")
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    @Excel(name = "缺陷总数", orderNum = "2")
-    private Integer entryNum = 0;
-    /**
-     * 病案首页不合格病历数
-     */
-    @Excel(name = "不合格数", orderNum = "3")
-    private Integer secondLevelNum = 0;
-    /**
-     * 质控病历数
-     */
-    @Excel(name = "质控病历数", orderNum = "11")
-    private Integer mrNum = 0;
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-    /**
-     * 质控评分（平均分）
-     */
-    @Excel(name = "质控平均分", orderNum = "10")
-    private Double averageValue = 0d;
-    /**
-     * 病案首页合格病历数
-     */
-    @Excel(name = "合格数", orderNum = "4")
-    private Integer firstLevelNum = 0;
-    /**
-     * 病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0.00d;
-    /**
-     * 病案首页不合格病历占比
-     */
-    private Double secondLevelPercent = 0.00d;
-    /**
-     * 病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "合格率", orderNum = "5")
-    private String firstLevelPercentStr = "0.00%";
-    /**
-     * 病案首页不合格病历占比（百分比）
-     */
-    private String secondLevelPercentStr = "0.00%";
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    private String deptClass;
-    /**
-     * 空项数
-     */
-    @Excel(name = "空项数", orderNum = "6")
-    private Integer emptyNum = 0;
-    /**
-     * 错误数
-     */
-    @Excel(name = "错误数", orderNum = "8")
-    private Integer errorNum = 0;
-    /**
-     * 完整率、完善率分母（质控病历数*病案首页条目数）
-     */
-    private Integer entryTotleNum = 0;
-    /**
-     * 完整率
-     */
-    private Double emptyPercent = 0.00d;
-    /**
-     * 完善率
-     */
-    private Double errorPercent = 0.00d;
-    /**
-     * 完整率（百分比）
-     */
-    @Excel(name = "完整率", orderNum = "7")
-    private String emptyPercentStr = "0.00%";
-    /**
-     * 完善率（百分比）
-     */
-    @Excel(name = "完善率", orderNum = "9")
-    private String errorPercentStr = "0.00%";
-}

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

@@ -1,88 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/6 20:03
- */
-@Getter
-@Setter
-public class HomePageImproveDTO {
-    /**
-     * 科室编码
-     */
-    private String deptId;
-    /**
-     * 科室
-     */
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String deptName;
-    /**
-     * 质控总数（总病历数）
-     */
-    @Excel(name = "质控总数", width = 10, orderNum = "2")
-    private Integer mrNum = 0;
-    /**
-     * 核查数量
-     */
-    @Excel(name = "核查数量", width = 10, orderNum = "3")
-    private Integer checkedNum = 0;
-    /**
-     * 核查占比
-     */
-    private Double checkedPercent = 0d;
-    /**
-     * 核查占比（百分比）
-     */
-    private String checkedPercentStr = "0.00%";
-    /**
-     * 有病案首页的病历数
-     */
-    private Integer homePageMRNum = 0;
-    /**
-     * 已改善数量
-     */
-    @Excel(name = "已改善数量", width = 10, orderNum = "4")
-    private Integer improveNum = 0;
-    /**
-     * 改善率
-     */
-    private Double improvePercent = 0d;
-    /**
-     * 改善率（百分比）
-     */
-    @Excel(name = "改善率", width = 10, orderNum = "5")
-    private String improvePercentStr = "0.00%";
-    /**
-     * 改善至合格数量
-     */
-    @Excel(name = "改善至合格数量", width = 15, orderNum = "6")
-    private Integer improveToPassNum = 0;
-    /**
-     * 改善至合格率
-     */
-    private Double improveToPassPercent = 0d;
-    /**
-     * 改善至合格率（百分比）
-     */
-    @Excel(name = "改善至合格率", width = 15, orderNum = "7")
-    private String improveToPassPercentStr = "0.00%";
-    /**
-     * 改善至满分数量
-     */
-    @Excel(name = "改善至满分数量", width = 15, orderNum = "8")
-    private Integer improveToFullNum = 0;
-    /**
-     * 改善至满分率
-     */
-    private Double improveToFullPercent = 0d;
-    /**
-     * 改善至满分率（百分比）
-     */
-    @Excel(name = "改善至满分率", width = 15, orderNum = "9")
-    private String improveToFullPercentStr = "0.00%";
-}

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

@@ -1,118 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:病案首页合格率占比返回结构
- * @Author:zhaops
- * @time: 2020/6/5 17:32
- */
-@Getter
-@Setter
-public class HomePageNumDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    @Excel(name = "科室", width = 30, orderNum = "1")
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    @Excel(name = "缺陷总数", orderNum = "2")
-    private Integer entryNum = 0;
-    /**
-     * 病案首页不合格病历数
-     */
-    @Excel(name = "不合格数", orderNum = "3")
-    private Integer secondLevelNum = 0;
-    /**
-     * 质控病历数
-     */
-    @Excel(name = "质控病历数", orderNum = "11")
-    private Integer mrNum = 0;
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-    /**
-     * 质控评分（平均分）
-     */
-    @Excel(name = "质控平均分", orderNum = "10")
-    private Double averageValue = 0d;
-    /**
-     * 病案首页合格病历数
-     */
-    @Excel(name = "合格数", orderNum = "4")
-    private Integer firstLevelNum = 0;
-    /**
-     * 病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0.00d;
-    /**
-     * 病案首页不合格病历占比
-     */
-    private Double secondLevelPercent = 0.00d;
-    /**
-     * 病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "合格率", orderNum = "5")
-    private String firstLevelPercentStr = "0.00%";
-    /**
-     * 病案首页不合格病历占比（百分比）
-     */
-    private String secondLevelPercentStr = "0.00%";
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    private String deptClass;
-    /**
-     * 空项数
-     */
-    @Excel(name = "空项数", orderNum = "6")
-    private Integer emptyNum = 0;
-    /**
-     * 错误数
-     */
-    @Excel(name = "错误数", orderNum = "8")
-    private Integer errorNum = 0;
-    /**
-     * 完整率、完善率分母（质控病历数*病案首页条目数）
-     */
-    private Integer entryTotleNum = 0;
-    /**
-     * 完整率
-     */
-    private Double emptyPercent = 0.00d;
-    /**
-     * 完善率
-     */
-    private Double errorPercent = 0.00d;
-    /**
-     * 完整率（百分比）
-     */
-    @Excel(name = "完整率", orderNum = "7")
-    private String emptyPercentStr = "0.00%";
-    /**
-     * 完善率（百分比）
-     */
-    @Excel(name = "完善率", orderNum = "9")
-    private String errorPercentStr = "0.00%";
-}

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

@@ -1,89 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/6 20:03
- */
-@Getter
-@Setter
-public class ImproveByDeptDTO {
-    /**
-     * 科室编码
-     */
-    private String deptId;
-
-    /**
-     * 主治医生
-     */
-    @Excel(name = "主治医生", width = 30)
-    private String doctorName;
-    /**
-     * 质控总数（总病历数）
-     */
-    @Excel(name = "质控总数", width = 10)
-    private Integer mrNum = 0;
-    /**
-     * 核查数量
-     */
-    @Excel(name = "核查数量", width = 10)
-    private Integer checkedNum = 0;
-    /**
-     * 核查占比
-     */
-    private Double checkedPercent = 0d;
-    /**
-     * 核查占比（百分比）
-     */
-    private String checkedPercentStr = "0.00%";
-    /**
-     * 有病案首页的病历数
-     */
-    private Integer homePageMRNum = 0;
-    /**
-     * 已改善数量
-     */
-    @Excel(name = "已改善数量", width = 10)
-    private Integer improveNum = 0;
-    /**
-     * 改善率
-     */
-    private Double improvePercent = 0d;
-    /**
-     * 改善率（百分比）
-     */
-    @Excel(name = "改善率", width = 10)
-    private String improvePercentStr = "0.00%";
-    /**
-     * 改善至合格数量
-     */
-    @Excel(name = "改善至合格数量", width = 15)
-    private Integer improveToPassNum = 0;
-    /**
-     * 改善至合格率
-     */
-    private Double improveToPassPercent = 0d;
-    /**
-     * 改善至合格率（百分比）
-     */
-    @Excel(name = "改善至合格率", width = 15)
-    private String improveToPassPercentStr = "0.00%";
-    /**
-     * 改善至满分数量
-     */
-    @Excel(name = "改善至满分数量", width = 15)
-    private Integer improveToFullNum = 0;
-    /**
-     * 改善至满分率
-     */
-    private Double improveToFullPercent = 0d;
-    /**
-     * 改善至满分率（百分比）
-     */
-    @Excel(name = "改善至满分率", width = 15)
-    private String improveToFullPercentStr = "0.00%";
-}

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

@@ -1,26 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/6 20:03
- */
-@Getter
-@Setter
-public class ImproveExportByDeptDTO {
-
-    /**
-     * 科室
-     */
-    @Excel(name = "科室", width = 30,needMerge = true)
-    private String deptName;
-    @ExcelCollection(name = "")
-    private List<ImproveByDeptDTO> improveByDeptDTOS;
-}

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

@@ -1,288 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:各科室缺陷占比返回结构
- * @Author:zhaops
- * @time: 2020/5/19 16:04
- */
-@Getter
-@Setter
-public class LevelStatisticsDTO {
-    /**
-     * 科室id（科室编码）
-     */
-//    @Excel(name = "科室编码", orderNum = "0")
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    @Excel(name = "科室", width = 30, orderNum = "2")
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    private Integer entryNum = 0;
-
-    /**
-     * 缺陷条目数-带升降标示
-     */
-    @Excel(name = "缺陷总数", orderNum = "3")
-    private String entryStrNum = "0";
-
-    /**
-     * 同比总数
-     */
-    private Integer sameNum = 0;
-
-    /**
-     * 同比总数-带升降标示
-     */
-    @Excel(name = "同比总数", orderNum = "4")
-    private String sameStrNum = "0";
-
-    /**
-     * 缺陷条目数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer entrySameNum = 0;
-
-    /**
-     * 质控病历数
-     */
-    private Integer mrNum = 0;
-
-    /**
-     * 质控病历数-带升降标示
-     */
-    @Excel(name = "质控病历数", orderNum = "7")
-    private String mrStrNum = "0";
-
-    /**
-     * 同比病历数
-     */
-    private Integer sameMrNum= 0;
-
-    /**
-     * 同比病历数-带升降标示
-     */
-    @Excel(name = "同比质控数", orderNum = "8")
-    private String sameMrStrNum = "0";
-
-    /**
-     * 质控病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer mrSameNum = 0;
-
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-
-    /**
-     * 同比质控评分（总分）
-     */
-    private Double sameTotleValue= 0d;
-
-
-    /**
-     * 质控评分（平均分）
-     */
-    private Double averageValue = 0d;
-
-    /**
-     * 质控评分（平均分）-带升降标示
-     */
-    @Excel(name = "质控平均分", orderNum = "5")
-    private String averageStrValue = "0";
-
-    /**
-     * 同比评分（平均分）
-     */
-    private Double sameAvgValue = 0d;
-
-    /**
-     * 同比评分（平均分）-带升降标示
-     */
-    @Excel(name = "同比平均分", orderNum = "6")
-    private String sameAvgStrValue = "0";
-
-    /**
-     * 质控评分现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer avSameValue = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数
-     */
-    private Integer firstLevelNum = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "甲级病历数", orderNum = "9")
-    private String firstLevelStrNum = "0";
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数
-     */
-    private Integer sameFirstLevelNum = 0;
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "同比甲级数", orderNum = "10")
-    private String sameFirstLevelStrNum = "0";
-
-    /**
-     * 甲级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数
-     */
-    private Integer secondLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "乙级病历数", orderNum = "11")
-    private String secondLevelStrNum = "0";
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数
-     */
-    private Integer sameSecondLevelNum = 0;
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "同比乙级数", orderNum = "12")
-    private String sameSecondLevelStrNum = "0";
-
-
-    /**
-     * 乙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelNum = 0;
-
-    /**
-     * 丙级病历数
-     */
-    private Integer thirdLevelNum = 0;
-
-    /**
-     * 丙级病历数-带升降标示
-     */
-    @Excel(name = "丙级病历数", orderNum = "13")
-    private String thirdLevelStrNum = "0";
-
-    /**
-     * 同比丙级病历数
-     */
-    private Integer sameThirdLevelNum = 0;
-
-    /**
-     * 同比丙级病历数-带升降标示
-     */
-    @Excel(name = "同比丙级数", orderNum = "14")
-    private String sameThirdLevelStrNum = "0";
-
-    /**
-     * 丙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelNum = 0;
-
-    /**
-     * 甲级病历占比/病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0d;
-
-    /**
-     * 同比甲级病历占比/病案首页合格病历占比
-     */
-    private Double sameFirstLevelPercent = 0d;
-
-    /**
-     * 甲级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelPercent = 0;
-
-    /**
-     * 乙级病历占比/病案首页不合格病历占比
-     */
-    private Double secondLevelPercent= 0d;
-
-    /**
-     * 同比乙级病历占比/病案首页不合格病历占比
-     */
-    private Double sameSecondLevelPercent = 0d;
-
-    /**
-     * 乙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelPercent = 0;
-
-    /**
-     * 丙级病历占比
-     */
-    private Double thirdLevelPercent= 0d;
-
-    /**
-     * 同比丙级病历占比
-     */
-    private Double sameThirdLevelPercent = 0d;
-
-    /**
-     * 丙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelPercent = 0;
-
-    /**
-     * 甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "甲级率", orderNum = "15")
-    private String firstLevelPercentStr = "0.00%";
-
-    /**
-     * 同比甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "同比甲级率", orderNum = "16")
-    private String sameFirstLevelPercentStr = "0.00%";
-
-    /**
-     * 乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "乙级率", orderNum = "17")
-    private String secondLevelPercentStr = "0.00%";
-
-    /**
-     * 同比乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "同比乙级率", orderNum = "18")
-    private String sameSecondLevelPercentStr = "0.00%";
-
-    /**
-     * 丙级病历占比（百分比）
-     */
-    @Excel(name = "丙级率", orderNum = "19")
-    private String thirdLevelPercentStr = "0.00%";
-
-    /**
-     * 同比丙级病历占比（百分比）
-     */
-    @Excel(name = "同比丙级率", orderNum = "20")
-    private String sameThirdLevelPercentStr = "0.00%";
-
-}

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

@@ -1,24 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:各科室缺陷占比-台州
- * @Author:zhaops
- * @time: 2020/6/22 13:41
- */
-@Getter
-@Setter
-public class LevelStatisticsTZDTO extends LevelStatisticsDTO {
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    @Excel(name = "科室系统", orderNum = "1", replace = { "内科系统_内科", "外科系统_外科", "-_null" })
-    private String deptClass;
-}

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

@@ -1,289 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:各科室缺陷占比返回结构
- * @Author:zhaops
- * @time: 2020/5/19 16:04
- */
-@Getter
-@Setter
-public class LevelStsByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-//    @Excel(name = "科室编码", orderNum = "0")
-    private String deptId;
-    /**
-     * 科室名称
-     */
-
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "2")
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    private Integer entryNum = 0;
-
-    /**
-     * 缺陷条目数-带升降标示
-     */
-    @Excel(name = "缺陷总数", orderNum = "3")
-    private String entryStrNum = "0";
-
-    /**
-     * 同比总数
-     */
-    private Integer sameNum = 0;
-
-    /**
-     * 同比总数-带升降标示
-     */
-    @Excel(name = "同比总数", orderNum = "4")
-    private String sameStrNum = "0";
-
-    /**
-     * 缺陷条目数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer entrySameNum = 0;
-
-    /**
-     * 质控病历数
-     */
-    private Integer mrNum = 0;
-
-    /**
-     * 质控病历数-带升降标示
-     */
-    @Excel(name = "质控病历数", orderNum = "7")
-    private String mrStrNum = "0";
-
-    /**
-     * 同比病历数
-     */
-    private Integer sameMrNum= 0;
-
-    /**
-     * 同比病历数-带升降标示
-     */
-    @Excel(name = "同比质控数", orderNum = "8")
-    private String sameMrStrNum = "0";
-
-    /**
-     * 质控病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer mrSameNum = 0;
-
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-
-    /**
-     * 同比质控评分（总分）
-     */
-    private Double sameTotleValue= 0d;
-
-
-    /**
-     * 质控评分（平均分）
-     */
-    private Double averageValue = 0d;
-
-    /**
-     * 质控评分（平均分）-带升降标示
-     */
-    @Excel(name = "质控平均分", orderNum = "5")
-    private String averageStrValue = "0";
-
-    /**
-     * 同比评分（平均分）
-     */
-    private Double sameAvgValue = 0d;
-
-    /**
-     * 同比评分（平均分）-带升降标示
-     */
-    @Excel(name = "同比平均分", orderNum = "6")
-    private String sameAvgStrValue = "0";
-
-    /**
-     * 质控评分现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer avSameValue = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数
-     */
-    private Integer firstLevelNum = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "甲级病历数", orderNum = "9")
-    private String firstLevelStrNum = "0";
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数
-     */
-    private Integer sameFirstLevelNum = 0;
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "同比甲级数", orderNum = "10")
-    private String sameFirstLevelStrNum = "0";
-
-    /**
-     * 甲级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数
-     */
-    private Integer secondLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "乙级病历数", orderNum = "11")
-    private String secondLevelStrNum = "0";
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数
-     */
-    private Integer sameSecondLevelNum = 0;
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "同比乙级数", orderNum = "12")
-    private String sameSecondLevelStrNum = "0";
-
-
-    /**
-     * 乙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelNum = 0;
-
-    /**
-     * 丙级病历数
-     */
-    private Integer thirdLevelNum = 0;
-
-    /**
-     * 丙级病历数-带升降标示
-     */
-    @Excel(name = "丙级病历数", orderNum = "13")
-    private String thirdLevelStrNum = "0";
-
-    /**
-     * 同比丙级病历数
-     */
-    private Integer sameThirdLevelNum = 0;
-
-    /**
-     * 同比丙级病历数-带升降标示
-     */
-    @Excel(name = "同比丙级数", orderNum = "14")
-    private String sameThirdLevelStrNum = "0";
-
-    /**
-     * 丙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelNum = 0;
-
-    /**
-     * 甲级病历占比/病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0d;
-
-    /**
-     * 同比甲级病历占比/病案首页合格病历占比
-     */
-    private Double sameFirstLevelPercent = 0d;
-
-    /**
-     * 甲级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelPercent = 0;
-
-    /**
-     * 乙级病历占比/病案首页不合格病历占比
-     */
-    private Double secondLevelPercent= 0d;
-
-    /**
-     * 同比乙级病历占比/病案首页不合格病历占比
-     */
-    private Double sameSecondLevelPercent = 0d;
-
-    /**
-     * 乙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelPercent = 0;
-
-    /**
-     * 丙级病历占比
-     */
-    private Double thirdLevelPercent= 0d;
-
-    /**
-     * 同比丙级病历占比
-     */
-    private Double sameThirdLevelPercent = 0d;
-
-    /**
-     * 丙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelPercent = 0;
-
-    /**
-     * 甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "甲级率", orderNum = "15")
-    private String firstLevelPercentStr = "0.00%";
-
-    /**
-     * 同比甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "同比甲级率", orderNum = "16")
-    private String sameFirstLevelPercentStr = "0.00%";
-
-    /**
-     * 乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "乙级率", orderNum = "17")
-    private String secondLevelPercentStr = "0.00%";
-
-    /**
-     * 同比乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "同比乙级率", orderNum = "18")
-    private String sameSecondLevelPercentStr = "0.00%";
-
-    /**
-     * 丙级病历占比（百分比）
-     */
-    @Excel(name = "丙级率", orderNum = "19")
-    private String thirdLevelPercentStr = "0.00%";
-
-    /**
-     * 同比丙级病历占比（百分比）
-     */
-    @Excel(name = "同比丙级率", orderNum = "20")
-    private String sameThirdLevelPercentStr = "0.00%";
-
-}

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

@@ -1,318 +0,0 @@
-package com.lantone.common.dto.report;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-08-04
- */
-public class MedLisResultDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    private Integer hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 报告代码
-     */
-    private String itemCode;
-
-    /**
-     * medLisResult报告名称
-     */
-    private String reportName;
-
-    /**
-     * medLisInfo报告名称
-     */
-    private String repName;
-
-    /**
-     * 报告名称
-     */
-    private String itemName;
-
-    /**
-     * 检验结果
-     */
-    private String result;
-
-    /**
-     * 参考值
-     */
-    private String reference;
-
-    /**
-     * 最小参考值
-     */
-    private String referenceMin;
-
-    /**
-     * 最大参考值
-     */
-    private String referenceMax;
-
-    /**
-     * 单位
-     */
-    private String unit;
-
-    /**
-     * 异常标志
-     */
-    private String abnormal;
-
-    /**
-     * 异常颜色
-     */
-    private String color;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    public MedLisResultDTO(String repNo, Integer hospitalId, String behospitalCode, String itemCode, String reportName, String repName, String itemName, String result, String reference, String referenceMin, String referenceMax, String unit, String abnormal, String color, String isDeleted, LocalDateTime gmtCreate, LocalDateTime gmtModified, String creator, String modifier) {
-        this.repNo = repNo;
-        this.hospitalId = hospitalId;
-        this.behospitalCode = behospitalCode;
-        this.itemCode = itemCode;
-        this.reportName = reportName;
-        this.repName = repName;
-        this.itemName = itemName;
-        this.result = result;
-        this.reference = reference;
-        this.referenceMin = referenceMin;
-        this.referenceMax = referenceMax;
-        this.unit = unit;
-        this.abnormal = abnormal;
-        this.color = color;
-        this.isDeleted = isDeleted;
-        this.gmtCreate = gmtCreate;
-        this.gmtModified = gmtModified;
-        this.creator = creator;
-        this.modifier = modifier;
-    }
-
-    public MedLisResultDTO() {
-    }
-
-    public void setRepNo(String repNo) {
-        this.repNo = repNo;
-    }
-
-    public void setHospitalId(Integer hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-
-    public void setItemCode(String itemCode) {
-        this.itemCode = itemCode;
-    }
-
-    public void setReportName(String reportName) {
-        this.reportName = reportName;
-    }
-
-    public void setRepName(String repName) {
-        this.repName = repName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public void setReference(String reference) {
-        this.reference = reference;
-    }
-
-    public void setReferenceMin(String referenceMin) {
-        this.referenceMin = referenceMin;
-    }
-
-    public void setReferenceMax(String referenceMax) {
-        this.referenceMax = referenceMax;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public void setAbnormal(String abnormal) {
-        this.abnormal = abnormal;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getRepNo() {
-        return repNo;
-    }
-
-    public Integer getHospitalId() {
-        return hospitalId;
-    }
-
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public String getItemCode() {
-        return itemCode;
-    }
-
-    public String getReportName() {
-        return reportName;
-    }
-
-    public String getRepName() {
-        return repName;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public String getReference() {
-        return reference;
-    }
-
-    public String getReferenceMin() {
-        return referenceMin;
-    }
-
-    public String getReferenceMax() {
-        return referenceMax;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public String getAbnormal() {
-        return abnormal;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public LocalDateTime getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public LocalDateTime getGmtModified() {
-        return gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "MedLisResultDTO{" +
-                "repNo='" + repNo + '\'' +
-                ", hospitalId=" + hospitalId +
-                ", behospitalCode='" + behospitalCode + '\'' +
-                ", itemCode='" + itemCode + '\'' +
-                ", reportName='" + reportName + '\'' +
-                ", repName='" + repName + '\'' +
-                ", itemName='" + itemName + '\'' +
-                ", result='" + result + '\'' +
-                ", reference='" + reference + '\'' +
-                ", referenceMin='" + referenceMin + '\'' +
-                ", referenceMax='" + referenceMax + '\'' +
-                ", unit='" + unit + '\'' +
-                ", abnormal='" + abnormal + '\'' +
-                ", color='" + color + '\'' +
-                ", isDeleted='" + isDeleted + '\'' +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator='" + creator + '\'' +
-                ", modifier='" + modifier + '\'' +
-                '}';
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 病案管理指标病历
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class MedManageParamsDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-
-   // 医嘱项目名称
-    private String daItemName;
-
-
-    //医嘱处方类型
-    private String doctorAdviceType;
-
-    //化验报告名称
-    private String repName;
-
-    //医嘱状态判别
-    private String daStatus;
-
-    //病历标题
-    private String content;
-
-    //文书内容（blob）
-    private String rec_title;
-
-
-
-}

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

@@ -1,110 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-08-04
- */
-@Data
-public class MedPacsResultDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 报告名称
-     */
-    private String reptName;
-
-    /**
-     * 检查部位
-     */
-    private String part;
-
-    /**
-     * 检查所见
-     */
-    private String clinicSight;
-
-    /**
-     * 检查结果诊断
-     */
-    private String reptDiag;
-
-    /**
-     * 观察记录
-     */
-    private String remark;
-
-    /**
-     * 临床诊断
-     */
-    private String clinicDiag;
-
-    /**
-     * 申请医生
-     */
-    private String applyDoctor;
-
-    /**
-     * 审核医生
-     */
-    private String checkerDoctor;
-
-    /**
-     * 报告医生
-     */
-    private String reportDoctor;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private LocalDateTime gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private LocalDateTime gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-}

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

@@ -1,223 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * @Description:医疗质量控制指标
- * @Author:cy
- * @time: 2021/1/20 13:32
- */
-@Getter
-@Setter
-public class MedQualityControlDTO {
-
-    /**
-     * 住院病案管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "住院病案管理人员月均负担出院患者病历数", width = 12, orderNum = "1")
-    private Double managerBeNum = 0d;
-
-    /**
-     * 病案编码管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "病案编码管理人员月均负担出院患者病历数", width = 12, orderNum = "2")
-    private Double coderBeNum= 0d;
-
-    /**
-     * 门诊病案管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "门诊病案管理人员月均负担出院患者病历数", width = 12, orderNum = "3")
-    private Double secManagerBeNum= 0d;
-
-    /**
-     * 入院记录24小时内完成量
-     */
-    private Double admissionNum;
-
-    /**
-     * 入院记录24小时内完成率
-     */
-    @Excel(name = "入院记录24小时内完成率", width = 12, orderNum = "4")
-    private String admissionStr;
-
-    /**
-     * 手术记录24小时内完成量
-     */
-    private Double operationNum;
-
-    /**
-     * 手术记录24小时内完成率
-     */
-    @Excel(name = "手术记录24小时内完成率", width = 12, orderNum = "5")
-    private String operationStr;
-
-    /**
-     * 手术相关记录完整量
-     */
-    private Double  operationRecordNum;
-
-    /**
-     * 手术相关记录完整率
-     */
-    @Excel(name = "手术相关记录完整率", width = 12, orderNum = "5")
-    private String operationRecordStr  = "0.00%";
-
-
-    /**
-     * 出院记录24小时内完成量
-     */
-    private Double leaveHospitalNum;
-
-    /**
-     * 出院记录24小时内完成率
-     */
-    @Excel(name = "出院记录24小时内完成率", width = 12, orderNum = "6")
-    private String leaveHospitalStr;
-
-    /**
-     * 病案首页24小时内完成量
-     */
-    private Double medHomePageNum;
-
-    /**
-     * 病案首页24小时内完成率
-     */
-    @Excel(name = "病案首页24小时内完成率",width = 12, orderNum = "7")
-    private String medHomePageStr;
-
-    /**
-     * 医师查房记录完成量
-     */
-    private Double WardRoundNum;
-
-    /**
-     * 医师查房记录完成率
-     */
-    @Excel(name = "医师查房记录完成率",width = 12, orderNum = "8")
-    private String WardRoundStr = "0.00%";
-
-    /**
-     * 临床用血相关记录符合量
-     */
-    @Excel(name = "临床用血相关记录符合率",width = 12, orderNum = "8")
-    private Double bloodNum;
-    //临床用血相关记录符合率
-    private String bloodStr = "0.00%";
-
-    /**
-     * 患者抢救记录6h完成量
-     */
-    private Double rescueNum;
-
-    /**
-     * 患者抢救记录6h完成率
-     */
-    @Excel(name = "患者抢救记录完成率",width = 12, orderNum = "9")
-    private String rescueStr = "0.00%";
-
-    /**
-     * 出院患者病历2日归档量
-     */
-    private Double leaveSecFileNum;
-
-    /**
-     * 出院患者病历2日归档率
-     */
-    @Excel(name = "出院患者病历2日归档完整率",width = 12, orderNum = "10")
-    private String leaveSecFileStr = "0.00%";
-
-    /**
-     * 出院患者病历归档完整量
-     */
-    private Double leaveFileNum;
-
-    /**
-     * 出院患者病历归档完整率
-     */
-    @Excel(name = "出院患者病历归档完整率",width = 12, orderNum = "11")
-    private String leaveFileStr;
-
-    /**
-     * 主要诊断填写正确量
-     */
-    private Double mainDiagnosisNum;
-
-    /**
-     * 主要诊断填写正确率
-     */
-    @Excel(name = "主要诊断填写正确率",width = 12, orderNum = "12")
-    private String mainDiagnosisStr;
-
-    /**
-     * 主要诊断编码正确量
-     */
-    private Double mainCodeDiagnosisNum;
-
-    /**
-     * 主要诊断编码正确率
-     */
-    @Excel(name = "扣分", width = 12,orderNum = "13")
-    private String mainCodeDiagnosisStr;
-
-    /**
-     * 不合理复制病历发生量
-     */
-    private Double  notCopiedNum;
-
-    /**
-     * 不合理复制病历发生率
-     */
-    @Excel(name = "不合理复制病历发生率",width = 12, orderNum = "14")
-    private String  notCopiedStr;
-
-    /**
-     * 甲级病历量
-     */
-    private Double firGradeNum= 0d;
-
-    /**
-     * 甲级病历率
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "15")
-    private String firGradeStr = "0.00%";
-
-    /**
-     * CT检查记录符合率
-     */
-    @Excel(name = "CT检查记录符合率",width = 12, orderNum = "16")
-    private String CTExaminationConform;
-
-    /**
-     * MRI检查记录符合率
-     */
-    @Excel(name = "MRI检查记录符合率",width = 12, orderNum = "18")
-    private String MRIExaminationConform;
-
-
-    /**
-     * 病理检查记录符合率
-     */
-    @Excel(name = "病理检查记录符合率",width = 12, orderNum = "20")
-    private String PathologicalExamination;
-
-    /**
-     * 细菌培养检查记录符合率
-     */
-    @Excel(name = "细菌培养检查记录符合率",width = 12, orderNum = "21")
-    private String BacterialCulture;
-
-    /**
-     * 抗菌药物使用记录符合率
-     */
-    @Excel(name = "抗菌药物使用记录符合率",width = 12, orderNum = "22")
-    private String AntibacterialDrugUse;
-
-    /**
-     * 恶性肿瘤化学治疗记录符合率
-     */
-    @Excel(name = "恶性肿瘤化学治疗记录符合率",width = 12, orderNum = "23")
-    private String ChemotherapyMalignantTumors;
-}

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

@@ -1,207 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckDTO{
-
-    //科室名称
-    private String deptName;
-
-    //科室id
-    private String deptId;
-
-    //医生
-    private String doctorName;
-
-    //医疗组
-    private String doctorGroup;
-
-    //入院记录未24小时内_id
-    private String entry_2658_id;
-
-    //入院记录未24小时内_name
-    private String entry_2658_name;
-
-    //入院记录未24小时内_num
-    private Integer entry_2658_num = 0;
-
-    //首次病程记录未8小时内_id
-    private String entry_2686_id;
-
-    //首次病程记录未8小时内_name
-    private String entry_2686_name;
-
-    //首次病程记录未8小时内_num
-    private Integer entry_2686_num = 0;
-
-    //副主任/主任医师首次查房72小时内未完成_id
-    private String entry_2657_id;
-
-    //副主任/主任医师首次查房72小时内未完成_name
-    private String entry_2657_name;
-
-    //副主任/主任医师首次查房72小时内未完成_num
-    private Integer entry_2657_num = 0;
-
-    //入院后未连记3天病程_id
-    private String entry_3010_id;
-
-    //入院后未连记3天病程_name
-    private String entry_3010_name;
-
-    //入院后未连记3天病程_num
-    private Integer entry_3010_num = 0;
-
-    //每周未至少2次副主任/主任医师查房_id
-    private String entry_2655_id;
-
-    //每周未至少2次副主任/主任医师查房_name
-    private String entry_2655_name;
-
-    //每周未至少2次副主任/主任医师查房_num
-    private Integer entry_2655_num = 0;
-
-    //每周未至少3次主治医师查房记录_id
-    private String entry_2654_id;
-
-    //每周未至少3次主治医师查房记录_name
-    private String entry_2654_name;
-
-    //每周未至少3次主治医师查房记录_num
-    private Integer entry_2654_num = 0;
-
-    //抢救记录未6小时内完成_id
-    private String entry_2852_id;
-
-    //抢救记录未6小时内完成_name
-    private String entry_2852_name;
-
-    //抢救记录未6小时内完成-num
-    private Integer entry_2852_num = 0;
-
-    //会诊记录在会诊申请后未24小时完成_id
-    private String entry_2287_id;
-
-    //会诊记录在会诊申请后未24小时完成_name
-    private String entry_2287_name;
-
-    //会诊记录在会诊申请后未24小时完成_num
-    private Integer entry_2287_num = 0;
-
-    //术前讨论、术前小结未完成_id
-    private String entry_3025_id;
-
-    //术前讨论、术前小结未完成_name
-    private String entry_3025_name;
-
-    //术前讨论、术前小结未完成_num
-    private Integer entry_3025_num = 0;
-
-    //手术记录术后24小时内未完成_id
-    private String entry_2170_id;
-
-    //手术记录术后24小时内未完成_name
-    private String entry_2170_name;
-
-    //手术记录术后24小时内未完成_num
-    private Integer entry_2170_num = 0;
-
-    //术后首程在术后30分钟内未完成_id
-    private String entry_2930_id;
-
-    //术后首程在术后30分钟内未完成_name
-    private String entry_2930_name;
-
-    //术后首程在术后30分钟内未完成_num
-    private Integer entry_2930_num = 0;
-
-    //术后主刀查房24小时内未完成_id
-    private String entry_2900_id;
-
-    //术后主刀查房24小时内未完成_name
-    private String entry_2900_name;
-
-    //术后主刀查房24小时内未完成_num
-    private Integer entry_2900_num = 0;
-
-    //术后未连记3天病程_id
-    private String entry_2229_id;
-
-    //术后未连记3天病程_name
-    private String entry_2229_name;
-
-    //术后未连记3天病程_num
-    private Integer entry_2229_num = 0;
-
-    //转科后未连记3天病程_id
-    private String entry_2217_id;
-
-    //转科后未连记3天病程_name
-    private String entry_2217_name;
-
-    //转科后未连记3天病程_num
-    private Integer entry_2217_num = 0;
-
-    //转接科记录专科后24小时内未完成_id
-    private String entry_2218_id;
-
-    //转接科记录专科后24小时内未完成_name
-    private String entry_2218_name;
-
-    //转接科记录专科后24小时内未完成_num
-    private Integer entry_2218_num = 0;
-
-    //病危/重患者未每日记录病程_id
-    private String entry_2220_id;
-
-    //病危/重患者未每日记录病程_name
-    private String entry_2220_name;
-
-    //病危/重患者未每日记录病程_num
-    private Integer entry_2220_num = 0;
-
-    //输血后未完成输血记录_id
-    private String entry_2486_id;
-
-    //输血后未完成输血记录_name
-    private String entry_2486_name;
-
-    //输血后未完成输血记录_num
-    private Integer entry_2486_num = 0;
-
-    //24小时未完成输血后评价_id
-    private String entry_3063_id;
-
-    //24小时未完成输血后评价_name
-    private String entry_3063_name;
-
-    //24小时未完成输血后评价_num
-    private Integer entry_3063_num = 0;
-
-    //危急值未记录_id
-    private String entry_3062_id;
-
-    //危急值未记录_name
-    private String entry_3062_name;
-
-    //危急值未记录_num
-    private Integer entry_3062_num = 0;
-
-    //住院30天未阶段小结_id
-    private String entry_2495_id;
-
-    //住院30天未阶段小结_name
-    private String entry_2495_name;
-
-    //住院30天未阶段小结_num
-    private Integer entry_2495_num = 0;
-}
-

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

@@ -1,25 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckExportDTO  {
-
-    //科室名称
-    @Excel(name = "科室",width = 18,needMerge = true,orderNum = "1")
-    private String deptName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalDoctorExportDTO> medicalDoctorExportDTOS;
-}

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

@@ -1,18 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckIdNameDTO {
-
-    private String id;
-    private String name;
-}
-

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

@@ -1,96 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckTitleDTO {
-
-    //入院记录未24小时内
-    @Excel(name = "入院记录24小时内",orderNum = "1")
-    private String ryjlw_24 ;
-
-    //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内",orderNum = "2")
-    private String scbcjlw_8h;
-
-    @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "3")
-    //副主任/主任医师首次查房72小时内未完成
-    private String zrsccfw_72h;
-
-    //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "4")
-    private String ryhljbcw_3d;
-
-    //每周至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "5")
-    private String zrcfw_2w;
-
-    //每周至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录",orderNum = "6")
-    private String zzcfw_3w;
-
-    //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成",orderNum = "7")
-    private String qjjlw_6h;
-
-    //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "8")
-    private String hzjlw_24h;
-
-    //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成",orderNum = "9")
-    private String sqtlxjw;
-
-    //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成",orderNum = "10")
-    private String sxjlsw_24h;
-
-    //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成",orderNum = "11")
-    private String xhscw_30m;
-
-    //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成",orderNum = "12")
-    private String shzdcfw_24h;
-
-    //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "13")
-    private String shjbcw_3d;
-
-    //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "14")
-    private String zkjbcw_3d;
-
-    //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成",orderNum = "15")
-    private String zkjlw_24;
-
-    //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程",orderNum = "16")
-    private String bwzhjlbcw_md;
-
-    //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录",orderNum = "17")
-    private String sxhwjl;
-
-    //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价",orderNum = "18")
-    private String sxpjw_24;
-
-    //危急值未记录
-    @Excel(name = "危急值记录",orderNum = "19")
-    private String wjzwjl;
-
-    //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结",orderNum = "20")
-    private String wywwcxj;
-
-}

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

@@ -1,25 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDeptDTO {
-
-    //科室名称
-    @Excel(name = "科室",width = 18,needMerge = true,orderNum = "1")
-    private String deptName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalDoDeptDTO> medicalDoctorExportDTOS;
-}

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

@@ -1,25 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDoDeptDTO {
-
-    //医疗组
-    @Excel(name = "医疗组",needMerge = true,orderNum = "1")
-    private String doctorGroup;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalSeeByDeptDTO> medicalCheckTitleDTOS;
-}

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

@@ -1,25 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDoctorExportDTO {
-
-    //医疗组
-    @Excel(name = "医疗组",needMerge = true,orderNum = "1")
-    private String doctorName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalCheckTitleDTO> medicalCheckTitleDTOS;
-}

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

@@ -1,48 +0,0 @@
-package com.lantone.common.dto.report;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Data
-public class MedicalRecordDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    private String behospitalCode;
-    /**
-     * 病人医院ID
-     */
-    private Long hospitalId;
-    /**
-     * 模块id
-     */
-    private Long modeId;
-
-    /**
-     * 病历标题
-     */
-    private String recTitle;
-
-    /**
-     * 病历日期
-     */
-    private String recDate;
-
-    /**
-     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
-     */
-    private int isParsed = 0;
-
-}

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

@@ -1,100 +0,0 @@
-package com.lantone.common.dto.report;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2020/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalSeeByDeptDTO {
-
-    //主管医生
-    @Excel(name = "主管医生",orderNum = "1")
-    private String doctorName ;
-
-    //入院记录未24小时内
-    @Excel(name = "入院记录24小时内",orderNum = "2")
-    private String ryjlw_24 ;
-
-    //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内",orderNum = "3")
-    private String scbcjlw_8h;
-
-    @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "4")
-    //副主任/主任医师首次查房72小时内未完成
-    private String zrsccfw_72h;
-
-    //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "5")
-    private String ryhljbcw_3d;
-
-    //每周至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "6")
-    private String zrcfw_2w;
-
-    //每周至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录",orderNum = "7")
-    private String zzcfw_3w;
-
-    //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成",orderNum = "8")
-    private String qjjlw_6h;
-
-    //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "9")
-    private String hzjlw_24h;
-
-    //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成",orderNum = "10")
-    private String sqtlxjw;
-
-    //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成",orderNum = "11")
-    private String sxjlsw_24h;
-
-    //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成",orderNum = "12")
-    private String xhscw_30m;
-
-    //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成",orderNum = "13")
-    private String shzdcfw_24h;
-
-    //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "14")
-    private String shjbcw_3d;
-
-    //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "15")
-    private String zkjbcw_3d;
-
-    //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成",orderNum = "16")
-    private String zkjlw_24;
-
-    //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程",orderNum = "17")
-    private String bwzhjlbcw_md;
-
-    //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录",orderNum = "18")
-    private String sxhwjl;
-
-    //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价",orderNum = "19")
-    private String sxpjw_24;
-
-    //危急值未记录
-    @Excel(name = "危急值记录",orderNum = "20")
-    private String wjzwjl;
-
-    //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结",orderNum = "21")
-    private String wywwcxj;
-
-}