Merge remote-tracking branch 'origin/dev/20201224_2.0.0-最新' into debug

# Conflicts:
#	src/main/resources/mapper/BehospitalInfoMapper.xml

doc/024.20201009v1.4.6/qc_initv1.4.6.sql

@@ -0,0 +1,26 @@
+use `qc`;
+UPDATE `sys_user_pageset` SET  `order_no` = 0  WHERE user_id = -1 and name = '病历等级';
+UPDATE `sys_user_pageset` SET  `order_no` = 1  WHERE user_id = -1 and name = '病历得分';
+INSERT INTO `qc`.`sys_user_pageset`(`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `user_id`, `page_type`, `name`, `val`, `status`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 1, '病案首页得分', 'scoreBn', 0, 2, NULL);
+UPDATE `sys_user_pageset` SET  `order_no` = 3  WHERE user_id = -1 and name = '病人住院序号';
+UPDATE `sys_user_pageset` SET  `order_no` = 4  WHERE user_id = -1 and name = '病案首页核查状态';
+UPDATE `sys_user_pageset` SET  `order_no` = 5  WHERE user_id = -1 and name = '病案首页核查人';
+UPDATE `sys_user_pageset` SET  `order_no` = 6  WHERE user_id = -1 and name = '病案首页核查时间';
+UPDATE `sys_user_pageset` SET  `order_no` = 7  WHERE user_id = -1 and name = '病历核查状态';
+UPDATE `sys_user_pageset` SET  `order_no` = 8  WHERE user_id = -1 and name = '病历核查人';
+UPDATE `sys_user_pageset` SET  `order_no` = 9  WHERE user_id = -1 and name = '病历核查时间';
+UPDATE `sys_user_pageset` SET  `order_no` = 10  WHERE user_id = -1 and name = '病案号';
+UPDATE `sys_user_pageset` SET  `order_no` = 11  WHERE user_id = -1 and name = '病人姓名';
+UPDATE `sys_user_pageset` SET  `order_no` = 12  WHERE user_id = -1 and name = '性别';
+UPDATE `sys_user_pageset` SET  `order_no` = 13  WHERE user_id = -1 and name = '年龄';
+UPDATE `sys_user_pageset` SET  `order_no` = 14  WHERE user_id = -1 and name = '床号';
+UPDATE `sys_user_pageset` SET  `order_no` = 15  WHERE user_id = -1 and name = '入院日期';
+UPDATE `sys_user_pageset` SET  `order_no` = 16  WHERE user_id = -1 and name = '出院日期';
+UPDATE `sys_user_pageset` SET  `order_no` = 17  WHERE user_id = -1 and name = '归档日期';
+UPDATE `sys_user_pageset` SET  `order_no` = 18  WHERE user_id = -1 and name = '主诊断';
+UPDATE `sys_user_pageset` SET  `order_no` = 19  WHERE user_id = -1 and name = '住院医生';
+UPDATE `sys_user_pageset` SET  `order_no` = 20  WHERE user_id = -1 and name = '主管医生';
+UPDATE `sys_user_pageset` SET  `order_no` = 21  WHERE user_id = -1 and name = '主任医生';
+UPDATE `sys_user_pageset` SET  `order_no` = 22  WHERE user_id = -1 and name = '科室';
+UPDATE `sys_user_pageset` SET  `order_no` = 23  WHERE user_id = -1 and name = '评分时间';
+

doc/026.20201123v1.4.8/qc_initv1.4.8.sql

@@ -0,0 +1,36 @@
+use `qc`;
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+DROP TABLE IF EXISTS `med_transfer_record`;
+CREATE TABLE `med_transfer_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hospital_id` int(20) NOT NULL COMMENT '医院ID',
+  `behospital_code` varchar(50) NOT NULL COMMENT '病历号',
+  `name` varchar(32) DEFAULT NULL COMMENT '姓名',
+  `sex` varchar(2) DEFAULT NULL COMMENT '性别',
+  `age` int(5) DEFAULT NULL COMMENT '年龄',
+  `dept_name` varchar(255) DEFAULT NULL COMMENT '科别',
+  `transfer_out_date` datetime DEFAULT NULL COMMENT '转出日期',
+  `transfer_in_date` datetime DEFAULT NULL COMMENT '转入日期',
+  `transfer_out_dept` varchar(255) DEFAULT NULL COMMENT '转出科室',
+  `transfer_in_dept` varchar(255) DEFAULT NULL COMMENT '转入科室',
+  `rec_doctor` varchar(255) DEFAULT NULL COMMENT '记录医生',
+  `rec_date` datetime DEFAULT NULL COMMENT '记录时间',
+  `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
+  `is_deleted` varchar(3) DEFAULT 'N' COMMENT '是否删除',
+  `gmt_create` datetime DEFAULT NULL COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT NULL COMMENT '记录修改时间',
+  `creator` varchar(60) DEFAULT NULL COMMENT '创建人',
+  `modifier` varchar(60) DEFAULT NULL COMMENT '修改人',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='转入转出记录（标记时间）';
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+-- 索引脚本
+ALTER TABLE `med_home_page` ADD INDEX index_home_page_id ( `home_page_id` );
+ALTER TABLE `med_home_page` ADD INDEX index_hospital_id ( `hospital_id` );
+ALTER TABLE `med_home_page` ADD INDEX index_behospital_code ( `behospital_code` );
+ALTER TABLE `med_home_operation_info` ADD INDEX index_home_page_id ( `home_page_id` );

doc/027.20201130_5.4.1云平台/qc_initv20201130_5.4.1.sql

@@ -0,0 +1,2 @@
+use `qc`;
+ALTER TABLE `qc_type` ADD   `parent_type_id` VARCHAR(4) DEFAULT NULL COMMENT '父类质控id' AFTER `default_module`;

doc/028.20201210v1.4.9/qc_initv1.4.9.sql

@@ -0,0 +1,25 @@
+use `qc`;
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+DROP TABLE IF EXISTS `med_nurse`;
+CREATE TABLE `med_nurse` (
+  `rep_no` varchar(255) NOT NULL COMMENT '单号',
+  `hospital_id` int(11) NOT NULL COMMENT '医院ID',
+  `behospital_code` varchar(255) DEFAULT NULL COMMENT '住院病人ID',
+  `measure_time` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '测量时间',
+  `item_name` varchar(255) DEFAULT NULL COMMENT '生命体征名称',
+  `item_value` varchar(255) DEFAULT NULL COMMENT '生命体征数值',
+  `item_unit` varchar(255) DEFAULT NULL COMMENT '生命体征单位',
+  `item_type` varchar(255) DEFAULT NULL COMMENT '生命体征类型',
+  `is_deleted` char(3) DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(60) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(60) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  KEY `behospital_code` (`behospital_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+INSERT INTO `qc_mode`( `name`, `order_no`, `parent_id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `remark`) VALUES ( '护理信息', 259, 37, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', NULL);

src/main/java/com/diagbot/client/QcServiceClient.java

@@ -21,6 +21,9 @@ public interface QcServiceClient {
     @PostMapping(value = "/analyse/rec")
     Response<OutputInfo> extract(URI uri, QueryVo queryVo);
 
+    @PostMapping(value = "/analyse/standardFieldDock")
+    Response<OutputInfo> analyseField(URI uri, QueryVo queryVo);
+
 }
 
 

src/main/java/com/diagbot/client/hystrix/QcServiceHystrix.java

@@ -24,4 +24,9 @@ public class QcServiceHystrix implements QcServiceClient {
         log.error("【hystrix】调用{}异常", "extract");
         return null;
     }
+    @Override
+    public Response<OutputInfo> analyseField(URI uri, QueryVo queryVo){
+        log.error("【hystrix】调用{}异常", "analyseField");
+        return null;
+    }
 }

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

@@ -153,6 +153,21 @@ public class RedisConfigurer extends CachingConfigurerSupport {
         return getRedisTemplate(factory);
     }
 
+    /**
+     * 表字段和注释使用的redis
+     *
+     * @return
+     */
+    @Bean("factoryForTable")
+    public LettuceConnectionFactory redisConnectionFactoryForTable() {
+        return getRedisConnectionFactory(Integer.valueOf(databaseMr));
+    }
+
+    @Bean(name = "redisTemplateForTable")
+    public RedisTemplate<String, Object> redisTemplateForTable(@Qualifier("factoryForTable") LettuceConnectionFactory factory) {
+        return getRedisTemplate(factory);
+    }
+
 
     private LettuceConnectionFactory getRedisConnectionFactory(Integer database) {
         RedisStandaloneConfiguration connection = new RedisStandaloneConfiguration();

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

@@ -157,6 +157,13 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
+                .antMatchers("/qc/data/deleteFlag").permitAll()
+                .antMatchers("/qc/data/placeFile").permitAll()
+                .antMatchers("/qc/data/sendLisResults").permitAll()
+                .antMatchers("/qc/data/sendPacsResults").permitAll()
+                .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
+                .antMatchers("/qc/data/analyseRec").permitAll()
+                .antMatchers("/qc/data/hisDataDeal").permitAll()
                 .antMatchers("/qc/doctoradvice/getPage").permitAll()
                 .antMatchers("/qc/medPacsInfo/getCheckPage").permitAll()
                 .antMatchers("/qc/medLisInfo/getExaminePage").permitAll()
@@ -168,11 +175,35 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/medicalCheckInnerExport").permitAll()
                 .antMatchers("/console/badLevelPage").permitAll()
                 .antMatchers("/console/export/badLevelPagePageExport").permitAll()
+                .antMatchers("/qc/medNurse/getMedNursePage").permitAll()
+                .antMatchers("/qc/behospitalInfo/exportQcresultByPerson").permitAll()
+                .antMatchers("/consoleByDept/beHosCountByDept").permitAll()
+                .antMatchers("/consoleByDept/casesEntryStatisticsByDept").permitAll()
+                .antMatchers("/bas/doctor/getList").permitAll()
+                .antMatchers("/consoleByDept/homePageOrGoodLevelByDept").permitAll()
+                .antMatchers("/print/export/homePageLevelExportByDept").permitAll()
+                .antMatchers("/print/export/homePageOrLevelExportByDept").permitAll()
+                .antMatchers("/print/export/entryGroupExportByDeptPage").permitAll()
+                .antMatchers("/print/export/entryGroupExportByDeptCase").permitAll()
+                .antMatchers("/print/export/entryGroupExportByDeptEntry").permitAll()
+                .antMatchers("/print/export/qcResultShortExportByDeptPage").permitAll()
+                .antMatchers("/print/export/levelExportByDept").permitAll()
+                .antMatchers("/consoleByDept/entryStatisticsByDept").permitAll()
+                .antMatchers("/print/export/entryStatisticsExportByDept").permitAll()
+                .antMatchers("/consoleByDept/leaveHosMRPageByDept").permitAll()
+                .antMatchers("/print/export/leaveHosMrPageExportByDept").permitAll()
+                .antMatchers("/consoleByDept/qcCheckStatisticsByDept").permitAll()
+                .antMatchers("/print/export/qcCheckStaExportByDept").permitAll()
+                .antMatchers("/consoleByDept/qcCheckMRPageByDept").permitAll()
+                .antMatchers("/print/export/qcCheckMRPageExportByDept").permitAll()
+                .antMatchers("/consoleByDept/hmImproveMRPageByDept").permitAll()
+                .antMatchers("/print/export/improveMRExportByDept").permitAll()
+                .antMatchers("/consoleByDept/reHos31DaysPageByDept").permitAll()
+                .antMatchers("/print/export/reHos31DaysPageExportByDept").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }
 
-
     @Override
     public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
         log.info("Configuring ResourceServerSecurityConfigurer");

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

@@ -201,6 +201,13 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendHomeDiagnose", request)
                 || matchers("/qc/data/sendHomeOperation", request)
                 || matchers("/qc/data/sendCrisis", request)
+                || matchers("/qc/data/deleteFlag", request)
+                || matchers("/qc/data/placeFile", request)
+                || matchers("/qc/data/sendLisResults", request)
+                || matchers("/qc/data/sendPacsResults", request)
+                || matchers("/qc/data/getColumnZhAndCh", request)
+                || matchers("/qc/data/analyseRec", request)
+                || matchers("/qc/data/hisDataDeal", request)
                 || matchers("/qc/doctoradvice/getPage", request)
                 || matchers("/qc/medPacsInfo/getCheckPage", request)
                 || matchers("/qc/medLisInfo/getExaminePage", request)
@@ -212,6 +219,31 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/medicalCheckInnerExport", request)
                 || matchers("/console/badLevelPage", request)
                 || matchers("/console/export/badLevelPagePageExport", request)
+                || matchers("/qc/medNurse/getMedNursePage", request)
+                || matchers("/qc/behospitalInfo/exportQcresultByPerson", request)
+                || matchers("/consoleByDept/beHosCountByDept", request)
+                || matchers("/consoleByDept/casesEntryStatisticsByDept", request)
+                || matchers("/bas/doctor/getList", request)
+                || matchers("/consoleByDept/homePageOrGoodLevelByDept", request)
+                || matchers("/print/export/homePageLevelExportByDept", request)
+                || matchers("/print/export/homePageOrLevelExportByDept", request)
+                || matchers("/print/export/entryGroupExportByDeptPage", request)
+                || matchers("/print/export/entryGroupExportByDeptCase", request)
+                || matchers("/print/export/entryGroupExportByDeptEntry", request)
+                || matchers("/print/export/qcResultShortExportByDeptPage", request)
+                || matchers("/print/export/levelExportByDept", request)
+                || matchers("/consoleByDept/entryStatisticsByDept", request)
+                || matchers("/print/export/entryStatisticsExportByDept", request)
+                || matchers("/consoleByDept/leaveHosMRPageByDept", request)
+                || matchers("/print/export/leaveHosMrPageExportByDept", request)
+                || matchers("/consoleByDept/qcCheckStatisticsByDept", request)
+                || matchers("/print/export/qcCheckStaExportByDept", request)
+                || matchers("/consoleByDept/qcCheckMRPageByDept", request)
+                || matchers("/print/export/qcCheckMRPageExportByDept", request)
+                || matchers("/consoleByDept/hmImproveMRPageByDept", request)
+                || matchers("/print/export/improveMRExportByDept", request)
+                || matchers("/consoleByDept/reHos31DaysPageByDept", request)
+                || matchers("/print/export/reHos31DaysPageExportByDept", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/dto/AdmissionCountDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+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;
+}

src/main/java/com/diagbot/dto/AnalyzeRunDTO.java

@@ -3,6 +3,7 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,10 +15,14 @@ import java.util.List;
 @Getter
 @Setter
 public class AnalyzeRunDTO {
-    // //得分
-    // private BigDecimal scoreRes;
-    // //等级
-    // private String level;
+    //得分
+    private BigDecimal scoreRes;
+    //等级
+    private String level;
+    //缺陷总数
+    private Long num;
+    //缺陷总扣分
+    private BigDecimal numScore;
     // 缺陷条目
     private List<MsgDTO> msgDTOList = new ArrayList<>();
 }

src/main/java/com/diagbot/dto/AverageStatisticsDTO.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Setter
 public class AverageStatisticsDTO {
     private String id;
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String name;
     private Integer num = 0;
     private Integer sameNum = 0; //同期num

src/main/java/com/diagbot/dto/AverageStatisticsFeeDTO.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Setter
 public class AverageStatisticsFeeDTO {
     private String id;
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String name;
     private Integer num;
     @Excel(name = "本年平均住院花费（元）", width = 15, orderNum = "2")
@@ -26,4 +26,4 @@ public class AverageStatisticsFeeDTO {
     private Double lastYearAverageValue = 0d;
     //科室分类
     private String deptClass;
-}
+}

src/main/java/com/diagbot/dto/AverageStatisticsFeeMonthDTO.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Setter
 public class AverageStatisticsFeeMonthDTO {
     private String id;
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String name;
     private Integer num;
     @Excel(name = "本月平均住院花费（元）", width = 15, orderNum = "2")
@@ -27,4 +27,4 @@ public class AverageStatisticsFeeMonthDTO {
     private Double lastYearAverageValue = 0d;
     //科室分类
     private String deptClass;
-}
+}

src/main/java/com/diagbot/dto/AverageStatisticsMonthDTO.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Setter
 public class AverageStatisticsMonthDTO {
     private String id;
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String name;
     private Integer num;
     @Excel(name = "本月平均住院天数（天）", width = 15, orderNum = "2")
@@ -27,4 +27,4 @@ public class AverageStatisticsMonthDTO {
     private Double lastYearAverageValue = 0d;
     //科室分类
     private String deptClass;
-}
+}

src/main/java/com/diagbot/dto/DeptEntryNumDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,6 +20,7 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷名称
      */
+    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
     private String name;
     /**
      * 模块id
@@ -27,6 +29,7 @@ public class DeptEntryNumDTO {
     /**
      * 模块名称
      */
+    @Excel(name = "模块名称", width = 20, orderNum = "1")
     private String casesName;
     /**
      * 科室id
@@ -43,22 +46,27 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷数
      */
+    @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：错误)

src/main/java/com/diagbot/dto/EntryNumDTO.java

@@ -28,7 +28,7 @@ public class EntryNumDTO {
     /**
      * 模块名称
      */
-    @Excel(name = "所属模块", width = 20, orderNum = "1")
+    @Excel(name = "模块名称", width = 20, orderNum = "1")
     private String casesName;
     /**
      * 条目缺陷总数

src/main/java/com/diagbot/dto/EntryNumGroupDTO.java

@@ -28,7 +28,7 @@ public class EntryNumGroupDTO {
     /**
      * 模块名称
      */
-    @Excel(name = "所属模块", width = 20, orderNum = "1")
+    @Excel(name = "模块名称", width = 20, orderNum = "1")
     private String casesName;
     /**
      * 条目缺陷总数

src/main/java/com/diagbot/dto/EntryStasByDeptDTO.java

@@ -0,0 +1,177 @@
+package com.diagbot.dto;
+
+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;
+}

src/main/java/com/diagbot/dto/EntryStatisticsDTO.java

@@ -19,7 +19,7 @@ public class EntryStatisticsDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String deptName;
     /**
      * 未在24小时内完成会诊数
@@ -174,4 +174,4 @@ public class EntryStatisticsDTO {
      * 病人住院超过30天的病历数
      */
     private Integer stageSummaryMRNum = 0;
-}
+}

src/main/java/com/diagbot/dto/ExportExcelBehByDeptDTO.java

@@ -0,0 +1,34 @@
+package com.diagbot.dto;
+
+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;
+
+}

src/main/java/com/diagbot/dto/ExportExcelBehospitalDTO.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Setter
 public class ExportExcelBehospitalDTO {
     @Excel(name = "主管医生", needMerge = true)
-    private String behDoctorName;
+    private String doctorName;
     @Excel(name = "患者姓名", needMerge = true)
     private String patName;
     @Excel(name = "住院号", needMerge = true)

src/main/java/com/diagbot/dto/ExportExcelByDeptDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+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;
+
+
+}

src/main/java/com/diagbot/dto/ExportExcelCaseDTO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Getter
 @Setter
 public class ExportExcelCaseDTO {
-    @Excel(name = "错误所属区块", needMerge = true)
+    @Excel(name = "模块名称", needMerge = true)
     private String caseName;
     @ExcelCollection(name = "")
     private List<ExportExcelMsgDTO> exportExcelMsgDTOS;

src/main/java/com/diagbot/dto/ExportExcelWideBehByDeptDTO.java

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+
+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;
+}

src/main/java/com/diagbot/dto/ExportExcelWideBehospitalDTO.java

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+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;
+}

src/main/java/com/diagbot/dto/ExportNinetyByDeptDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+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;
+
+}

src/main/java/com/diagbot/dto/ExportSevenByDeptDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+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;
+
+}

src/main/java/com/diagbot/dto/ExportWideExcelByDeptDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+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;
+
+
+}

src/main/java/com/diagbot/dto/ExportWideExcelDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+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;
+
+
+}

src/main/java/com/diagbot/dto/HomePageByDeptDTO.java

@@ -0,0 +1,118 @@
+package com.diagbot.dto;
+
+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%";
+}

src/main/java/com/diagbot/dto/HomePageImproveDTO.java

@@ -19,7 +19,7 @@ public class HomePageImproveDTO {
     /**
      * 科室
      */
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String deptName;
     /**
      * 质控总数（总病历数）
@@ -85,4 +85,4 @@ public class HomePageImproveDTO {
      */
     @Excel(name = "改善至满分率", width = 15, orderNum = "9")
     private String improveToFullPercentStr = "0.00%";
-}
+}

src/main/java/com/diagbot/dto/HomePageNumDTO.java

@@ -19,7 +19,7 @@ public class HomePageNumDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String deptName;
     /**
      * 主管医生id

src/main/java/com/diagbot/dto/ImproveByDeptDTO.java

@@ -0,0 +1,89 @@
+package com.diagbot.dto;
+
+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%";
+}

src/main/java/com/diagbot/dto/ImproveExportByDeptDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+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;
+}

src/main/java/com/diagbot/dto/LevelStatisticsDTO.java

@@ -20,7 +20,7 @@ public class LevelStatisticsDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室名称", width = 30, orderNum = "2")
+    @Excel(name = "科室", width = 30, orderNum = "2")
     private String deptName;
     /**
      * 主管医生id

src/main/java/com/diagbot/dto/LevelStsByDeptDTO.java

@@ -0,0 +1,289 @@
+package com.diagbot.dto;
+
+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%";
+
+}

src/main/java/com/diagbot/dto/MedLisResultDTO.java

@@ -45,6 +45,11 @@ public class MedLisResultDTO implements Serializable {
      */
     private String repName;
 
+    /**
+     * 报告名称
+     */
+    private String itemName;
+
     /**
      * 检验结果
      */
@@ -105,155 +110,185 @@ public class MedLisResultDTO implements Serializable {
      */
     private String modifier;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    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 String getRepNo() {
-        return repNo;
+    public MedLisResultDTO() {
     }
 
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
 
-    public Integer getHospitalId() {
-        return hospitalId;
-    }
-
     public void setHospitalId(Integer hospitalId) {
         this.hospitalId = hospitalId;
     }
 
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
     public void setBehospitalCode(String behospitalCode) {
         this.behospitalCode = behospitalCode;
     }
 
-    public String getItemCode() {
-        return itemCode;
-    }
-
     public void setItemCode(String itemCode) {
         this.itemCode = itemCode;
     }
 
-    public String getModifier() {
-        return modifier;
+    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 String getReportName() {
-        return reportName;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public void setReportName(String reportName) {
-        this.reportName = reportName;
+    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 void setRepName(String repName) {
-        this.repName = repName;
+    public String getItemName() {
+        return itemName;
     }
 
     public String getResult() {
         return result;
     }
 
-    public void setResult(String result) {
-        this.result = result;
-    }
-
     public String getReference() {
         return reference;
     }
 
-    public void setReference(String reference) {
-        this.reference = reference;
-    }
-
     public String getReferenceMin() {
         return referenceMin;
     }
 
-    public void setReferenceMin(String referenceMin) {
-        this.referenceMin = referenceMin;
-    }
-
     public String getReferenceMax() {
         return referenceMax;
     }
 
-    public void setReferenceMax(String referenceMax) {
-        this.referenceMax = referenceMax;
-    }
-
     public String getUnit() {
         return unit;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
     public String getAbnormal() {
         return abnormal;
     }
 
-    public void setAbnormal(String abnormal) {
-        this.abnormal = abnormal;
-    }
-
     public String getColor() {
         return color;
     }
 
-    public void setColor(String color) {
-        this.color = color;
-    }
-
     public String getIsDeleted() {
         return isDeleted;
     }
 
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
     public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
     public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
     public String getCreator() {
         return creator;
     }
 
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public MedLisResultDTO() {
+    public String getModifier() {
+        return modifier;
     }
 
     @Override
@@ -265,6 +300,7 @@ public class MedLisResultDTO implements Serializable {
                 ", itemCode='" + itemCode + '\'' +
                 ", reportName='" + reportName + '\'' +
                 ", repName='" + repName + '\'' +
+                ", itemName='" + itemName + '\'' +
                 ", result='" + result + '\'' +
                 ", reference='" + reference + '\'' +
                 ", referenceMin='" + referenceMin + '\'' +

src/main/java/com/diagbot/dto/MedPacsResultDTO.java

@@ -0,0 +1,111 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <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;
+}

src/main/java/com/diagbot/dto/QcCasesEntryDTO.java

@@ -19,4 +19,7 @@ public class QcCasesEntryDTO {
     private String code;
 
     private String msg;
+
+    private String precond;
+
 }

src/main/java/com/diagbot/dto/QcResultApiDTO.java

@@ -18,14 +18,13 @@ public class QcResultApiDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 等级
-     */
-    private String level;
-
-    /**
-     * 最后得分
-     */
+    //得分
     private BigDecimal scoreRes;
+    //等级
+    private String level;
+    //缺陷总数
+    private Long num;
+    //缺陷总扣分
+    private BigDecimal numScore;
 
 }

src/main/java/com/diagbot/dto/QcResultPercentDTO.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 @Setter
 public class QcResultPercentDTO {
     private String deptId;
-    @Excel(name = "科室名称", width = 30, orderNum = "1")
+    @Excel(name = "科室", width = 30, orderNum = "1")
     private String deptName;
     private Integer totleNum;
     private Integer firstLevelNum;

src/main/java/com/diagbot/dto/RecordContentDTO.java

@@ -3,6 +3,9 @@ package com.diagbot.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -51,6 +54,11 @@ public class RecordContentDTO implements Serializable {
      */
     private String recId;
 
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
     /**
      * 病历类别编号
      */
@@ -61,4 +69,16 @@ public class RecordContentDTO implements Serializable {
      */
     private Long modeId;
 
+    /**
+     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
+     */
+    private int isParsed = 0;
+    /**
+     *转出时间集合-qc作判断
+     */
+    List<LocalDateTime> transferOutDate = new ArrayList<>();
+    /**
+     *转入时间集合-qc作判断
+     */
+    List<LocalDateTime> transferInDate = new ArrayList<>();
 }

src/main/java/com/diagbot/dto/data/ColumnZhAndChDTO.java

@@ -0,0 +1,11 @@
+package com.diagbot.dto.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ColumnZhAndChDTO {
+    private String en;//英文字段名转对应的属性名
+    private String ch;//中文注释
+}

src/main/java/com/diagbot/entity/HomeOperationInfo.java

@@ -93,11 +93,6 @@ public class HomeOperationInfo implements Serializable {
      */
     private String shamOperationName;
 
-    /**
-     * 麻醉医师
-     */
-    private String anaesthesiaDoctor;
-
     /**
      * 是否删除,N:未删除，Y:删除
      */
@@ -113,6 +108,11 @@ public class HomeOperationInfo implements Serializable {
      */
     private Date gmtModified;
 
+    /**
+     * 麻醉医师
+     */
+    private String anaesthesiaDoctor;
+
     /**
      * 创建人，0表示无创建人值
      */

src/main/java/com/diagbot/entity/HomePage.java

@@ -89,7 +89,7 @@ public class HomePage implements Serializable {
     private Date birthday;
 
     /**
-     * 年龄
+     * 年龄(拼接年龄单位)
      */
     private String age;
 

src/main/java/com/diagbot/entity/MedAbnormalInfo.java

@@ -0,0 +1,181 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-24
+ */
+public class MedAbnormalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "abnormal_id", type = IdType.AUTO)
+    private Long abnormalId;
+
+    /**
+     * 模块名称
+     */
+    private String moduleName;
+
+    /**
+     * 文书id
+     */
+    private String recId;
+
+    /**
+     * 入参
+     */
+    private String paramIn;
+
+    /**
+     * 出参
+     */
+    private String paramOut;
+
+    /**
+     * 异常描述
+     */
+    private String ramark;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getAbnormalId() {
+        return abnormalId;
+    }
+
+    public void setAbnormalId(Long abnormalId) {
+        this.abnormalId = abnormalId;
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+
+    public String getParamIn() {
+        return paramIn;
+    }
+
+    public void setParamIn(String paramIn) {
+        this.paramIn = paramIn;
+    }
+
+    public String getParamOut() {
+        return paramOut;
+    }
+
+    public void setParamOut(String paramOut) {
+        this.paramOut = paramOut;
+    }
+
+    public String getRamark() {
+        return ramark;
+    }
+
+    public void setRamark(String ramark) {
+        this.ramark = ramark;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedAbnormalInfo{" +
+                "abnormalId=" + abnormalId +
+                ", moduleName=" + moduleName +
+                ", recId=" + recId +
+                ", paramIn=" + paramIn +
+                ", paramOut=" + paramOut +
+                ", ramark=" + ramark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

src/main/java/com/diagbot/entity/MedLisResult.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public class MedLisResult implements Serializable {
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -83,12 +83,12 @@ public class MedLisResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -107,11 +107,11 @@ public class MedLisResult implements Serializable {
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -191,18 +191,18 @@ public class MedLisResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

src/main/java/com/diagbot/entity/MedNurse.java

@@ -0,0 +1,86 @@
+package com.diagbot.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author cy
+ * @since 2020-12-11
+ */
+@Data
+public class MedNurse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private Integer hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 测量时间
+     */
+    private Date measureTime;
+
+    /**
+     * 生命体征名称
+     */
+    private String itemName;
+
+    /**
+     * 生命体征数值
+     */
+    private String itemValue;
+
+    /**
+     * 生命体征单位
+     */
+    private String itemUnit;
+
+    /**
+     * 生命体征类型
+     */
+    private String itemType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

src/main/java/com/diagbot/entity/MedPacsResult.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public class MedPacsResult implements Serializable {
     /**
      * 医院ID
      */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /**
      * 住院病人ID
@@ -88,12 +88,12 @@ public class MedPacsResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -112,11 +112,11 @@ public class MedPacsResult implements Serializable {
     public void setRepNo(String repNo) {
         this.repNo = repNo;
     }
-    public Integer getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(Integer hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
     public String getBehospitalCode() {
@@ -203,18 +203,18 @@ public class MedPacsResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

src/main/java/com/diagbot/entity/MedTransferRecord.java

@@ -0,0 +1,271 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 转入转出记录（标记时间）
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-12-01
+ */
+public class MedTransferRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Integer hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 转出日期
+     */
+    private LocalDateTime transferOutDate;
+
+    /**
+     * 转入日期
+     */
+    private LocalDateTime transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private LocalDateTime recDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public LocalDateTime getTransferOutDate() {
+        return transferOutDate;
+    }
+
+    public void setTransferOutDate(LocalDateTime transferOutDate) {
+        this.transferOutDate = transferOutDate;
+    }
+    public LocalDateTime getTransferInDate() {
+        return transferInDate;
+    }
+
+    public void setTransferInDate(LocalDateTime transferInDate) {
+        this.transferInDate = transferInDate;
+    }
+    public String getTransferOutDept() {
+        return transferOutDept;
+    }
+
+    public void setTransferOutDept(String transferOutDept) {
+        this.transferOutDept = transferOutDept;
+    }
+    public String getTransferInDept() {
+        return transferInDept;
+    }
+
+    public void setTransferInDept(String transferInDept) {
+        this.transferInDept = transferInDept;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public LocalDateTime getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(LocalDateTime recDate) {
+        this.recDate = recDate;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedTransferRecord{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", deptName=" + deptName +
+            ", transferOutDate=" + transferOutDate +
+            ", transferInDate=" + transferInDate +
+            ", transferOutDept=" + transferOutDept +
+            ", transferInDept=" + transferInDept +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/QcType.java

@@ -34,6 +34,11 @@ public class QcType implements Serializable {
      */
     private String name;
 
+    /**
+     * 默认模版是否开启(0-否 1-是)
+     */
+    private Long defaultModule;
+
     /**
      * 备注
      */
@@ -136,12 +141,21 @@ public class QcType implements Serializable {
         this.modifier = modifier;
     }
 
+    public Long getDefaultModule() {
+        return defaultModule;
+    }
+
+    public void setDefaultModule(Long defaultModule) {
+        this.defaultModule = defaultModule;
+    }
+
     @Override
     public String toString() {
         return "QcType{" +
                 "id=" + id +
                 ", hospitalId=" + hospitalId +
                 ", name=" + name +
+                ", defaultModule=" + defaultModule +
                 ", remark=" + remark +
                 ", isDeleted=" + isDeleted +
                 ", gmtCreate=" + gmtCreate +

src/main/java/com/diagbot/entity/RePlaceData.java

@@ -0,0 +1,19 @@
+package com.diagbot.entity;
+
+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 ;     //结构化大字段
+
+}

src/main/java/com/diagbot/entity/MedAdmissionNote.java

@@ -1,8 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_admission_note")
-public class MedAdmissionNote implements Serializable {
+public class StrAdmissionNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,6 +60,11 @@ public class MedAdmissionNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 出生日期
      */
@@ -377,6 +378,13 @@ public class MedAdmissionNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getBirthday() {
         return birthday;
     }
@@ -730,7 +738,7 @@ public class MedAdmissionNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedAdmissionNote{" +
+        return "StrAdmissionNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -740,6 +748,7 @@ public class MedAdmissionNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", birthday=" + birthday +
             ", marriage=" + marriage +
             ", jobType=" + jobType +

src/main/java/com/diagbot/entity/MedBloodResult.java

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_blood_result")
-public class MedBloodResult implements Serializable {
+public class StrBloodResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedBloodResult implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 效果评价
      */
@@ -186,6 +188,13 @@ public class MedBloodResult implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getTransfusionEvaluate() {
         return transfusionEvaluate;
     }
@@ -273,7 +282,7 @@ public class MedBloodResult implements Serializable {
 
     @Override
     public String toString() {
-        return "MedBloodResult{" +
+        return "StrBloodResult{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -283,6 +292,7 @@ public class MedBloodResult implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transfusionEvaluate=" + transfusionEvaluate +
             ", recDoctor=" + recDoctor +
             ", recDate=" + recDate +

src/main/java/com/diagbot/entity/MedBloodTransfusion.java

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_blood_transfusion")
-public class MedBloodTransfusion implements Serializable {
+public class StrBloodTransfusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedBloodTransfusion implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 开始时间
      */
@@ -206,6 +208,13 @@ public class MedBloodTransfusion implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getStartTime() {
         return startTime;
     }
@@ -321,7 +330,7 @@ public class MedBloodTransfusion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedBloodTransfusion{" +
+        return "StrBloodTransfusion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -331,6 +340,7 @@ public class MedBloodTransfusion implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", transfusionReason=" + transfusionReason +

src/main/java/com/diagbot/entity/MedConsultationApply.java

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_apply")
-public class MedConsultationApply implements Serializable {
+public class StrConsultationApply implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -68,6 +65,11 @@ public class MedConsultationApply implements Serializable {
      */
     private Date behospitalDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 申请科室
      */
@@ -253,6 +255,13 @@ public class MedConsultationApply implements Serializable {
     public void setBehospitalDate(Date behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getApplyDept() {
         return applyDept;
     }
@@ -417,7 +426,7 @@ public class MedConsultationApply implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationApply{" +
+        return "StrConsultationApply{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -428,6 +437,7 @@ public class MedConsultationApply implements Serializable {
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
             ", behospitalDate=" + behospitalDate +
+            ", recTitle=" + recTitle +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +
             ", applyDate=" + applyDate +

src/main/java/com/diagbot/entity/MedConsultationNote.java

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_note")
-public class MedConsultationNote implements Serializable {
+public class StrConsultationNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedConsultationNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 入院日期
      */
@@ -106,7 +108,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 诊疗情况
@@ -246,6 +248,13 @@ public class MedConsultationNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getBehospitalDate() {
         return behospitalDate;
     }
@@ -302,12 +311,12 @@ public class MedConsultationNote implements Serializable {
     public void setBriefNote(String briefNote) {
         this.briefNote = briefNote;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getTreatmentSituation() {
         return treatmentSituation;
@@ -417,7 +426,7 @@ public class MedConsultationNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationNote{" +
+        return "StrConsultationNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -427,6 +436,7 @@ public class MedConsultationNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +
@@ -435,7 +445,7 @@ public class MedConsultationNote implements Serializable {
             ", inviteDept=" + inviteDept +
             ", inviteDoctor=" + inviteDoctor +
             ", briefNote=" + briefNote +
-            ", diagnosis=" + diagnosis +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", treatmentSituation=" + treatmentSituation +
             ", consultationDate=" + consultationDate +
             ", consultationPurpose=" + consultationPurpose +

src/main/java/com/diagbot/entity/StrConsultationRecord.java

@@ -0,0 +1,467 @@
+package com.diagbot.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊记录
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-11-13
+ */
+public class StrConsultationRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+    public String getInviteType() {
+        return inviteType;
+    }
+
+    public void setInviteType(String inviteType) {
+        this.inviteType = inviteType;
+    }
+    public String getInviteDept() {
+        return inviteDept;
+    }
+
+    public void setInviteDept(String inviteDept) {
+        this.inviteDept = inviteDept;
+    }
+    public String getInviteDoctor() {
+        return inviteDoctor;
+    }
+
+    public void setInviteDoctor(String inviteDoctor) {
+        this.inviteDoctor = inviteDoctor;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatmentSituation() {
+        return treatmentSituation;
+    }
+
+    public void setTreatmentSituation(String treatmentSituation) {
+        this.treatmentSituation = treatmentSituation;
+    }
+    public Date getConsultationDate() {
+        return consultationDate;
+    }
+
+    public void setConsultationDate(Date consultationDate) {
+        this.consultationDate = consultationDate;
+    }
+    public String getConsultationPurpose() {
+        return consultationPurpose;
+    }
+
+    public void setConsultationPurpose(String consultationPurpose) {
+        this.consultationPurpose = consultationPurpose;
+    }
+    public String getConsultationOpinions() {
+        return consultationOpinions;
+    }
+
+    public void setConsultationOpinions(String consultationOpinions) {
+        this.consultationOpinions = consultationOpinions;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrConsultationRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatmentSituation=" + treatmentSituation +
+            ", consultationDate=" + consultationDate +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedConsultationResult.java

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_result")
-public class MedConsultationResult implements Serializable {
+public class StrConsultationResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedConsultationResult implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 入院日期
      */
@@ -236,6 +238,13 @@ public class MedConsultationResult implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getBehospitalDate() {
         return behospitalDate;
     }
@@ -393,7 +402,7 @@ public class MedConsultationResult implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationResult{" +
+        return "StrConsultationResult{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -403,6 +412,7 @@ public class MedConsultationResult implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +

src/main/java/com/diagbot/entity/MedCrisisNote.java

@@ -1,8 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,10 +9,9 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_crisis_note")
-public class MedCrisisNote implements Serializable {
+public class StrCrisisNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,6 +60,11 @@ public class MedCrisisNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 危急值报告
      */
@@ -197,6 +198,13 @@ public class MedCrisisNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getCrisisNote() {
         return crisisNote;
     }
@@ -298,7 +306,7 @@ public class MedCrisisNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedCrisisNote{" +
+        return "StrCrisisNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -308,6 +316,7 @@ public class MedCrisisNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", crisisNote=" + crisisNote +
             ", briefNote=" + briefNote +
             ", recieveDate=" + recieveDate +

src/main/java/com/diagbot/entity/StrDeathDiscussion.java

@@ -0,0 +1,440 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡病例讨论记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDeathDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 死亡诊断
+     */
+    private String deathDiagnosis;
+
+    /**
+     * 死亡原因
+     */
+    private String deathReason;
+
+    /**
+     * 死亡时间
+     */
+    private Date deathDate;
+
+    /**
+     * 讨论时间
+     */
+    private Date discussDate;
+
+    /**
+     * 讨论地点
+     */
+    private String discussPlace;
+
+    /**
+     * 主持人
+     */
+    private String anchor;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    private String briefHistory;
+
+    /**
+     * 讨论内容
+     */
+    private String discussionContent;
+
+    /**
+     * 主持人小结
+     */
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getDeathDiagnosis() {
+        return deathDiagnosis;
+    }
+
+    public void setDeathDiagnosis(String deathDiagnosis) {
+        this.deathDiagnosis = deathDiagnosis;
+    }
+    public String getDeathReason() {
+        return deathReason;
+    }
+
+    public void setDeathReason(String deathReason) {
+        this.deathReason = deathReason;
+    }
+    public Date getDeathDate() {
+        return deathDate;
+    }
+
+    public void setDeathDate(Date deathDate) {
+        this.deathDate = deathDate;
+    }
+    public Date getDiscussDate() {
+        return discussDate;
+    }
+
+    public void setDiscussDate(Date discussDate) {
+        this.discussDate = discussDate;
+    }
+    public String getDiscussPlace() {
+        return discussPlace;
+    }
+
+    public void setDiscussPlace(String discussPlace) {
+        this.discussPlace = discussPlace;
+    }
+    public String getAnchor() {
+        return anchor;
+    }
+
+    public void setAnchor(String anchor) {
+        this.anchor = anchor;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefHistory() {
+        return briefHistory;
+    }
+
+    public void setBriefHistory(String briefHistory) {
+        this.briefHistory = briefHistory;
+    }
+    public String getDiscussionContent() {
+        return discussionContent;
+    }
+
+    public void setDiscussionContent(String discussionContent) {
+        this.discussionContent = discussionContent;
+    }
+    public String getAnchorConclusion() {
+        return anchorConclusion;
+    }
+
+    public void setAnchorConclusion(String anchorConclusion) {
+        this.anchorConclusion = anchorConclusion;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrDeathDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", deathReason=" + deathReason +
+            ", deathDate=" + deathDate +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchor=" + anchor +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussionContent=" + discussionContent +
+            ", anchorConclusion=" + anchorConclusion +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedDeathNote.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_death_note")
-public class MedDeathNote implements Serializable {
+public class StrDeathNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedDeathNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 入院日期
      */
@@ -216,6 +218,13 @@ public class MedDeathNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getBehospitalDate() {
         return behospitalDate;
     }
@@ -345,7 +354,7 @@ public class MedDeathNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedDeathNote{" +
+        return "StrDeathNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -355,6 +364,7 @@ public class MedDeathNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", deathDate=" + deathDate +
             ", behospitalSituation=" + behospitalSituation +

src/main/java/com/diagbot/entity/MedDifficultCase.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_difficult_case")
-public class MedDifficultCase implements Serializable {
+public class StrDifficultCase implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedDifficultCase implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 讨论日期
      */
@@ -71,7 +73,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 讨论地点
      */
-    private Date discussPlace;
+    private String discussPlace;
 
     /**
      * 主持人姓名及专业技术职务
@@ -221,6 +223,13 @@ public class MedDifficultCase implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getDiscussDate() {
         return discussDate;
     }
@@ -228,11 +237,11 @@ public class MedDifficultCase implements Serializable {
     public void setDiscussDate(Date discussDate) {
         this.discussDate = discussDate;
     }
-    public Date getDiscussPlace() {
+    public String getDiscussPlace() {
         return discussPlace;
     }
 
-    public void setDiscussPlace(Date discussPlace) {
+    public void setDiscussPlace(String discussPlace) {
         this.discussPlace = discussPlace;
     }
     public String getAnchorMan() {
@@ -357,7 +366,7 @@ public class MedDifficultCase implements Serializable {
 
     @Override
     public String toString() {
-        return "MedDifficultCase{" +
+        return "StrDifficultCase{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -367,6 +376,7 @@ public class MedDifficultCase implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", discussDate=" + discussDate +
             ", discussPlace=" + discussPlace +
             ", anchorMan=" + anchorMan +

src/main/java/com/diagbot/entity/MedFirstRecord.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_first_record")
-public class MedFirstRecord implements Serializable {
+public class StrFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedFirstRecord implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 主诉
      */
@@ -231,6 +233,13 @@ public class MedFirstRecord implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getChief() {
         return chief;
     }
@@ -381,7 +390,7 @@ public class MedFirstRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedFirstRecord{" +
+        return "StrFirstRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -391,6 +400,7 @@ public class MedFirstRecord implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", chief=" + chief +
             ", present=" + present +
             ", pastHistory=" + pastHistory +

src/main/java/com/diagbot/entity/MedIllCritically.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ill_critically")
-public class MedIllCritically implements Serializable {
+public class StrIllCritically implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -43,15 +40,35 @@ public class MedIllCritically implements Serializable {
      */
     private String sex;
 
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
     /**
      * 病历日期
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 病情危重情况
@@ -148,6 +165,27 @@ public class MedIllCritically implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
     public Date getRecordDate() {
         return recordDate;
     }
@@ -155,12 +193,19 @@ public class MedIllCritically implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getCriticalSituation() {
         return criticalSituation;
@@ -249,14 +294,18 @@ public class MedIllCritically implements Serializable {
 
     @Override
     public String toString() {
-        return "MedIllCritically{" +
+        return "StrIllCritically{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", name=" + name +
             ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
             ", recordDate=" + recordDate +
-            ", diagnosis=" + diagnosis +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", criticalSituation=" + criticalSituation +
             ", patientSign=" + patientSign +
             ", patientSignDate=" + patientSignDate +

src/main/java/com/diagbot/entity/MedIllSeriousl.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ill_seriousl")
-public class MedIllSeriousl implements Serializable {
+public class StrIllSeriousl implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -43,15 +40,35 @@ public class MedIllSeriousl implements Serializable {
      */
     private String sex;
 
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
     /**
      * 病历日期
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 病情危重情况
@@ -148,6 +165,27 @@ public class MedIllSeriousl implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
     public Date getRecordDate() {
         return recordDate;
     }
@@ -155,12 +193,19 @@ public class MedIllSeriousl implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getCriticalSituation() {
         return criticalSituation;
@@ -249,14 +294,18 @@ public class MedIllSeriousl implements Serializable {
 
     @Override
     public String toString() {
-        return "MedIllSeriousl{" +
+        return "StrIllSeriousl{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
             ", name=" + name +
             ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
             ", recordDate=" + recordDate +
-            ", diagnosis=" + diagnosis +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", criticalSituation=" + criticalSituation +
             ", patientSign=" + patientSign +
             ", patientSignDate=" + patientSignDate +

src/main/java/com/diagbot/entity/StrInformedConsent.java

@@ -0,0 +1,167 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-01-04
+ */
+public class StrInformedConsent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    private String recId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历标题
+     */
+    private String recTitle;
+
+    /**
+     * 文书内容（blob）
+     */
+    private String content;
+
+    /**
+     * 文书类别
+     */
+    private String recType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getRecType() {
+        return recType;
+    }
+
+    public void setRecType(String recType) {
+        this.recType = recType;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrInformedConsent{" +
+            "recId=" + recId +
+            ", behospitalCode=" + behospitalCode +
+            ", hospitalId=" + hospitalId +
+            ", recTitle=" + recTitle +
+            ", content=" + content +
+            ", recType=" + recType +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedLeaveHospital.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_leave_hospital")
-public class MedLeaveHospital implements Serializable {
+public class StrLeaveHospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedLeaveHospital implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 入院日期
      */
@@ -231,6 +233,13 @@ public class MedLeaveHospital implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getBehospitalDate() {
         return behospitalDate;
     }
@@ -381,7 +390,7 @@ public class MedLeaveHospital implements Serializable {
 
     @Override
     public String toString() {
-        return "MedLeaveHospital{" +
+        return "StrLeaveHospital{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -391,6 +400,7 @@ public class MedLeaveHospital implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", leaveHospitalDate=" + leaveHospitalDate +
             ", tentativeDiagnosis=" + tentativeDiagnosis +

src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_operative_first_record")
-public class MedOperativeFirstRecord implements Serializable {
+public class StrOperativeFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 手术日期
      */
@@ -83,6 +85,11 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private String narcosisType;
 
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
     /**
      * 术前诊断
      */
@@ -93,6 +100,11 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private String postoperativeDiagnosis;
 
+    /**
+     * 手术人员
+     */
+    private String operationMan;
+
     /**
      * 手术名称方式
      */
@@ -123,6 +135,26 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private String postoperativeComplication;
 
+    /**
+     * 手术切除标本
+     */
+    private String operationSpecimen;
+
+    /**
+     * 术中出血量
+     */
+    private String operationBleed;
+
+    /**
+     * 术中输血量
+     */
+    private String operationBloodTransfusion;
+
+    /**
+     * 术中并发症
+     */
+    private String operationComplication;
+
     /**
      * 记录医生
      */
@@ -241,6 +273,13 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getOperationDate() {
         return operationDate;
     }
@@ -269,6 +308,13 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setNarcosisType(String narcosisType) {
         this.narcosisType = narcosisType;
     }
+    public String getNarcosisDoctor() {
+        return narcosisDoctor;
+    }
+
+    public void setNarcosisDoctor(String narcosisDoctor) {
+        this.narcosisDoctor = narcosisDoctor;
+    }
     public String getPreoperationDiagnosis() {
         return preoperationDiagnosis;
     }
@@ -283,6 +329,13 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
         this.postoperativeDiagnosis = postoperativeDiagnosis;
     }
+    public String getOperationMan() {
+        return operationMan;
+    }
+
+    public void setOperationMan(String operationMan) {
+        this.operationMan = operationMan;
+    }
     public String getOperationName() {
         return operationName;
     }
@@ -325,6 +378,34 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setPostoperativeComplication(String postoperativeComplication) {
         this.postoperativeComplication = postoperativeComplication;
     }
+    public String getOperationSpecimen() {
+        return operationSpecimen;
+    }
+
+    public void setOperationSpecimen(String operationSpecimen) {
+        this.operationSpecimen = operationSpecimen;
+    }
+    public String getOperationBleed() {
+        return operationBleed;
+    }
+
+    public void setOperationBleed(String operationBleed) {
+        this.operationBleed = operationBleed;
+    }
+    public String getOperationBloodTransfusion() {
+        return operationBloodTransfusion;
+    }
+
+    public void setOperationBloodTransfusion(String operationBloodTransfusion) {
+        this.operationBloodTransfusion = operationBloodTransfusion;
+    }
+    public String getOperationComplication() {
+        return operationComplication;
+    }
+
+    public void setOperationComplication(String operationComplication) {
+        this.operationComplication = operationComplication;
+    }
     public String getRecDoctor() {
         return recDoctor;
     }
@@ -405,7 +486,7 @@ public class MedOperativeFirstRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedOperativeFirstRecord{" +
+        return "StrOperativeFirstRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -415,18 +496,25 @@ public class MedOperativeFirstRecord implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", operationDate=" + operationDate +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", narcosisType=" + narcosisType +
+            ", narcosisDoctor=" + narcosisDoctor +
             ", preoperationDiagnosis=" + preoperationDiagnosis +
             ", postoperativeDiagnosis=" + postoperativeDiagnosis +
+            ", operationMan=" + operationMan +
             ", operationName=" + operationName +
             ", operationProcess=" + operationProcess +
             ", postoperativeSituation=" + postoperativeSituation +
             ", postoperativeTreatment=" + postoperativeTreatment +
             ", postoperativeNotice=" + postoperativeNotice +
             ", postoperativeComplication=" + postoperativeComplication +
+            ", operationSpecimen=" + operationSpecimen +
+            ", operationBleed=" + operationBleed +
+            ", operationBloodTransfusion=" + operationBloodTransfusion +
+            ", operationComplication=" + operationComplication +
             ", recDoctor=" + recDoctor +
             ", recDate=" + recDate +
             ", auditDoctor=" + auditDoctor +

src/main/java/com/diagbot/entity/MedOperativeNote.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_operative_note")
-public class MedOperativeNote implements Serializable {
+public class StrOperativeNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedOperativeNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 手术日期
      */
@@ -276,6 +278,13 @@ public class MedOperativeNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getOperationDate() {
         return operationDate;
     }
@@ -489,7 +498,7 @@ public class MedOperativeNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedOperativeNote{" +
+        return "StrOperativeNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -499,6 +508,7 @@ public class MedOperativeNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", operationDate=" + operationDate +
             ", startTime=" + startTime +
             ", endTime=" + endTime +

src/main/java/com/diagbot/entity/MedPeriodConclusion.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_period_conclusion")
-public class MedPeriodConclusion implements Serializable {
+public class StrPeriodConclusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedPeriodConclusion implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 参加人员
      */
@@ -221,6 +223,13 @@ public class MedPeriodConclusion implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getParticipant() {
         return participant;
     }
@@ -357,7 +366,7 @@ public class MedPeriodConclusion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedPeriodConclusion{" +
+        return "StrPeriodConclusion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -367,6 +376,7 @@ public class MedPeriodConclusion implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", participant=" + participant +
             ", chief=" + chief +
             ", behospitalSituation=" + behospitalSituation +

src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_preoperative_discussion")
-public class MedPreoperativeDiscussion implements Serializable {
+public class StrPreoperativeDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedPreoperativeDiscussion implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 讨论时间
      */
@@ -246,6 +248,13 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getDiscussTime() {
         return discussTime;
     }
@@ -417,7 +426,7 @@ public class MedPreoperativeDiscussion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedPreoperativeDiscussion{" +
+        return "StrPreoperativeDiscussion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -427,6 +436,7 @@ public class MedPreoperativeDiscussion implements Serializable {
             ", deptName=" + deptName +
             ", sex=" + sex +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", discussTime=" + discussTime +
             ", discussType=" + discussType +
             ", participant=" + participant +

src/main/java/com/diagbot/entity/MedRescueNote.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_rescue_note")
-public class MedRescueNote implements Serializable {
+public class StrRescueNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedRescueNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 开始时间
      */
@@ -206,6 +208,13 @@ public class MedRescueNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getStartTime() {
         return startTime;
     }
@@ -321,7 +330,7 @@ public class MedRescueNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedRescueNote{" +
+        return "StrRescueNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -331,6 +340,7 @@ public class MedRescueNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", briefNote=" + briefNote +

src/main/java/com/diagbot/entity/StrTalkInform.java

@@ -0,0 +1,167 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-01-04
+ */
+public class StrTalkInform implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    private String recId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历标题
+     */
+    private String recTitle;
+
+    /**
+     * 文书内容（blob）
+     */
+    private String content;
+
+    /**
+     * 文书类别
+     */
+    private String recType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getRecType() {
+        return recType;
+    }
+
+    public void setRecType(String recType) {
+        this.recType = recType;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrTalkInform{" +
+            "recId=" + recId +
+            ", behospitalCode=" + behospitalCode +
+            ", hospitalId=" + hospitalId +
+            ", recTitle=" + recTitle +
+            ", content=" + content +
+            ", recType=" + recType +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedTransferInNote.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_transfer_in_note")
-public class MedTransferInNote implements Serializable {
+public class StrTransferInNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +60,11 @@ public class MedTransferInNote implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 标题
+     */
+    private String recTitle;
+
     /**
      * 转入日期
      */
@@ -231,6 +233,13 @@ public class MedTransferInNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getTransferInDate() {
         return transferInDate;
     }
@@ -381,7 +390,7 @@ public class MedTransferInNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedTransferInNote{" +
+        return "StrTransferInNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -391,6 +400,7 @@ public class MedTransferInNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transferInDate=" + transferInDate +
             ", transferOutDept=" + transferOutDept +
             ", transferInDept=" + transferInDept +

src/main/java/com/diagbot/entity/MedTransferOutNote.java

@@ -1,8 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -10,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_transfer_out_note")
-public class MedTransferOutNote implements Serializable {
+public class StrTransferOutNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,7 +61,12 @@ public class MedTransferOutNote implements Serializable {
     private Date recordDate;
 
     /**
-     * 转入日期
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 转入日期   --实际转出日期 ！！不能改动
      */
     private Date transferInDate;
 
@@ -230,6 +233,13 @@ public class MedTransferOutNote implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public Date getTransferInDate() {
         return transferInDate;
     }
@@ -380,7 +390,7 @@ public class MedTransferOutNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedTransferOutNote{" +
+        return "StrTransferOutNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -390,6 +400,7 @@ public class MedTransferOutNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transferInDate=" + transferInDate +
             ", transferOutDept=" + transferOutDept +
             ", transferInDept=" + transferInDept +

src/main/java/com/diagbot/entity/MedWardRecord.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,10 +9,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ward_record")
-public class MedWardRecord implements Serializable {
+public class StrWardRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,18 +60,23 @@ public class MedWardRecord implements Serializable {
      */
     private Date recordDate;
 
+    /**
+     * 查房日期
+     */
+    private Date wardDate;
+
     /**
      * 查房医生
      */
     private String wardDoctor;
 
     /**
-     * 查房标题
+     * 标题
      */
     private String wardTitle;
 
     /**
-     * 病历内容
+     * 病情记录
      */
     private String wardContent;
 
@@ -216,6 +218,13 @@ public class MedWardRecord implements Serializable {
     public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
+    public Date getWardDate() {
+        return wardDate;
+    }
+
+    public void setWardDate(Date wardDate) {
+        this.wardDate = wardDate;
+    }
     public String getWardDoctor() {
         return wardDoctor;
     }
@@ -345,7 +354,7 @@ public class MedWardRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedWardRecord{" +
+        return "StrWardRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +
@@ -355,6 +364,7 @@ public class MedWardRecord implements Serializable {
             ", deptName=" + deptName +
             ", sex=" + sex +
             ", recordDate=" + recordDate +
+            ", wardDate=" + wardDate +
             ", wardDoctor=" + wardDoctor +
             ", wardTitle=" + wardTitle +
             ", wardContent=" + wardContent +

src/main/java/com/diagbot/enums/CacheKeyEnum.java

@@ -0,0 +1,91 @@
+package com.diagbot.enums;
+
+import lombok.Setter;
+
+public enum CacheKeyEnum implements KeyedString {
+    BEHOSPITAL_INFO("入院记录", "strAdmissionNote"),
+    BLOOD_RESULT("输血后效果评价", "strBloodResult"),
+    BLOOD_TRANSFUSION("输血/血制品病程记录", "strBloodTransfusion"),
+    PERIOD_CONCLUSION("阶段小结", "strPeriodConclusion"),
+    FIRST_RECORD("首次病程录","strFirstRecord"),
+    TRANSFER_IN_NOTE("转入记录", "strTransferInNote"),
+    TRANSFER_OUT_NOTE("转出记录", "strTransferOutNote"),
+    ILL_CRITICALLY("病危通知书", "strIllCritically"),
+    ILL_SERIOUSL("病重通知书", "strIllSeriousl"),
+    DIFFICULT_CASE("疑难病例讨论记录", "strDifficultCase"),
+    DEATH_NOTE("死亡记录", "strDeathNote"),
+    DEATH_DISCUSSION("死亡病例讨论记录", "strDeathDiscussion"),
+    WARD_RECORD("查房记录", "strWardRecord"),
+    OPERATIVE_FIRST_RECORD("术后首次病程及谈话记录", "strOperativeFirstRecord"),
+    PREOPERATIVE_DISCUSSION("术前讨论、术前小结", "strPreoperativeDiscussion"),
+    OPERATIVE_NOTE("手术记录", "strOperativeNote"),
+    RESCUE_NOTE("抢救记录", "strRescueNote"),
+    CRISIS_NOTE("危急值记录", "strCrisisNote"),
+    LEAVE_HOSPITAL("出院小结", "strLeaveHospital"),
+    CONSULTATION_APPLY("会诊申请单", "strConsultationApply"),
+    CONSULTATION_RESULT("会诊结果单", "strConsultationResult"),
+    CONSULTATION_NOTE("会诊单", "strConsultationNote"),
+    CONSULTATION_RECORD("会诊记录","strConsultationRecord");
+    /*
+    FIRST_RECORD(2, "aStrFirstRecordFacade"),
+    HOME_PAGE(6, "病案首页"),
+            (8, "医嘱信息"),
+            (9, "交接班记录"),
+            (10, "输血/血制品病程记录"),
+            (12, "麻醉记录"),
+            (13, "麻醉知情同意书"),
+            (14, "麻醉术前访视记录"),
+            (15, "麻醉术后访视记录"),
+            (16, "手术知情同意书"),
+    (20, "手术风险评估表"),
+    (21, "手术安全核查表"),
+    DATA_MODEL(33, "专科交接单"),
+    DATA_MODEL(34, "转科记录"),
+    DATA_MODEL(35, "病理检验送检单"),
+    DATA_MODEL(36, "自定义病程记录"),
+    DATA_MODEL(37, "病程信息"),
+    DATA_MODEL(52, "授权知情同意书"),
+    DATA_MODEL(53, "知情同意书"),
+    DATA_MODEL(54, "谈话告知书"),
+    DATA_MODEL(56, "日常病程录"),
+    OTHER(55, "其他"),
+    PACS_INTO(57, "检查信息"),
+    LIS_INFO(58, "检验信息"),
+    LIS_INFO(59, "有创操作"),
+    */
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    CacheKeyEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CacheKeyEnum getEnum(String key) {
+        for (CacheKeyEnum item : CacheKeyEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        CacheKeyEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/enums/KeyedString.java

@@ -0,0 +1,7 @@
+package com.diagbot.enums;
+
+public interface KeyedString {
+    String getKey();
+
+    String getName();
+}

src/main/java/com/diagbot/enums/ModeIdEnum.java

@@ -0,0 +1,87 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+public enum ModeIdEnum implements KeyedNamed {
+    BEHOSPITAL_INFO(1, "入院记录"),
+    FIRST_RECORD(2, "首次病程录"),
+    DEATH_DISCUSSION(3, "死亡病例讨论记录"),
+    WARD_RECORD(4, "查房记录"),
+    LEAVE_HOSPITAL(5, "出院小结"),
+    HOME_PAGE(6, "病案首页"),
+    CONSULTATION_NOTE1(7, "会诊记录"),
+//            (8, "医嘱信息"),
+//            (9, "交接班记录"),
+        BLOODNOTE(10, "输血/血制品病程记录"),
+    OPERATIVE_FRONT_SUM (11, "术前讨论、术前小结"),
+//            (12, "麻醉记录"),
+//            (13, "麻醉知情同意书"),
+//            (14, "麻醉术前访视记录"),
+//            (15, "麻醉术后访视记录"),
+    OPERATIVE_AGREE_BOOK (16, "手术知情同意书"),
+    OPERATIVE_FIRST_NOTE(18, "术后首次病程及谈话记录"),
+//            (20, "手术风险评估表"),
+OPERATIVE_SAFE_SURFACE (21, "手术安全核查表"),
+    DIFFICULT_CASE(19, "疑难病例讨论记录"),
+    OPERATIVE_NOTE(17, "手术记录"),
+    RESCUE_NOTE(22, "抢救记录"),
+    CRISIS_NOTE(23, "危急值记录"),
+    DEATH_NOTE(24, "死亡记录"),
+    ILL_CRITICALLY(25, "病危通知书"),
+    TRANSFER_IN_NOTE(26, "转入记录"),
+    TRANSFER_OUT_NOTE(27, "转出记录"),
+    PERIOD_CONCLUSION(28, "阶段小结"),
+    ILL_SERIOUSL(29, "病重通知书"),
+    CONSULTATION_APPLY(30, "会诊申请单"),
+    CONSULTATION_RESULT(31, "会诊结果单"),
+    DATA_MODEL(32, "输血后效果评价"),
+//    DATA_MODEL(33, "专科交接单"),
+//    DATA_MODEL(34, "转科记录"),
+//    DATA_MODEL(35, "病理检验送检单"),
+//    DATA_MODEL(36, "自定义病程记录"),
+//    DATA_MODEL(37, "病程信息"),
+//    DATA_MODEL(52, "授权知情同意书"),
+//    DATA_MODEL(53, "知情同意书"),
+//    DATA_MODEL(54, "谈话告知书"),
+//    DATA_MODEL(56, "日常病程录"),
+    OTHER(55, "其他"),
+    PACS_INTO(57, "检查信息"),
+    LIS_INFO(58, "检验信息"),
+    //LIS_INFO(59, "有创操作"),
+    CONSULTATION_NOTE(60, "会诊单");
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    ModeIdEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ModeIdEnum getEnum(int key) {
+        for (ModeIdEnum item : ModeIdEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        ModeIdEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/facade/BasDoctorInfoFacade.java

@@ -0,0 +1,75 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.BasDeptInfoDTO;
+import com.diagbot.entity.BasDeptInfo;
+import com.diagbot.entity.BasDoctorInfo;
+import com.diagbot.entity.SysUserDept;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.BasDeptInfoVO;
+import com.diagbot.vo.data.BasDoctorInfoVO;
+import io.swagger.models.auth.In;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/12/24 14:38
+ */
+@Component
+public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
+    @Autowired
+    SysUserDeptFacade sysUserDeptFacade;
+    @Autowired
+    BasDeptInfoFacade basDeptInfoFacade;
+
+    /**
+     * 获取医院医生下拉列表信息
+     *
+     * @param basDoctorInfoVO
+     * @return 医院医生下拉列表信息
+     */
+    public List<BasDoctorInfo> getDoctorByDept(BasDoctorInfoVO basDoctorInfoVO) {
+        basDoctorInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        basDoctorInfoVO.setUserId(Long.valueOf( SysUserUtils.getCurrentPrincipleID()));
+        QueryWrapper<SysUserDept> userDeptWrapper = new QueryWrapper<>();
+        List<BasDoctorInfo> list = new ArrayList<>();
+                userDeptWrapper.eq("hospital_id",basDoctorInfoVO.getHospitalId());
+        userDeptWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        userDeptWrapper.eq("user_id",basDoctorInfoVO.getUserId());
+        List<SysUserDept> UserDeptlist = sysUserDeptFacade.list(userDeptWrapper);
+        HashSet<String> deptSet = new HashSet<String>();
+        if(ListUtil.isNotEmpty(UserDeptlist)){
+            UserDeptlist.forEach(sysUserDept->{
+                deptSet.add(sysUserDept.getDeptId());
+            });
+            QueryWrapper<BasDeptInfo> deptInfo = new QueryWrapper<>();
+            deptInfo.eq("hospital_id",basDoctorInfoVO.getHospitalId());
+            deptInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
+            deptInfo.eq("dept_name",basDoctorInfoVO.getDeptName());
+            deptInfo.in("dept_id",deptSet);
+            BasDeptInfo deptOne = basDeptInfoFacade.getOne(deptInfo);
+            QueryWrapper<BasDoctorInfo> QueryWrapper = new QueryWrapper<>();
+            QueryWrapper.eq("hospital_id",basDoctorInfoVO.getHospitalId());
+            QueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+            QueryWrapper.eq("dept_id",deptOne.getDeptId());
+            if(StringUtils.isNotEmpty(basDoctorInfoVO.getInputStr())){
+                QueryWrapper.like("name",basDoctorInfoVO.getInputStr());
+            }
+            QueryWrapper.orderByAsc("name");
+            list = this.list(QueryWrapper);
+        }
+
+        return list;
+    }
+
+}

src/main/java/com/diagbot/facade/ConsoleByDeptExportFacade.java

@@ -0,0 +1,523 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.*;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.*;
+import com.diagbot.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 报表导出装饰层
+ * @author: gaodm
+ * @time: 2020/6/18 10:41
+ */
+@Component
+public class ConsoleByDeptExportFacade {
+
+    @Autowired
+    private ConsoleByDeptFacade consoleByDeptFacade;
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    private SysHospitalSetFacade sysHospitalSetFacade;
+    @Autowired
+    private FilterFacade filterFacade;
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+
+
+    /**
+     * 病案首页合格率占比
+     *
+     * @param filterOrderByDeptVO
+     * @return
+     */
+    public void homePageLevelExportByDept(HttpServletResponse response, FilterOrderByDeptVO filterOrderByDeptVO) {
+        List<HomePageByDeptDTO> res = consoleByDeptFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
+        String fileName = "病案首页合格率占比.xls";
+        ExcelUtils.exportExcel(res, null, "sheet1", HomePageByDeptDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 病案首页不合格/合格数
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public void homePageOrLevelExportByDept(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
+        solveParam(qcResultShortPageVO);
+        qcResultShortPageVO.setCurrent(1L);
+        qcResultShortPageVO.setSize(Long.MAX_VALUE);
+        qcResultShortPageVO.setSearchCount(false);
+        List<ExportExcelByDeptDTO> records = behospitalInfoFacade.homePageOrLevelExportByDept(qcResultShortPageVO);
+        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
+        if(ListUtil.isNotEmpty(records)){
+                ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+                exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+                exportByDeptDTO.setExportExcelByDeptDTOS(records);
+            resDTO.add(exportByDeptDTO);
+        }
+
+        List<ExportNinetyByDeptDTO> resWide = new ArrayList<ExportNinetyByDeptDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
+        String fileName = null;
+        if("不合格数".equals(qcResultShortPageVO.getTitleName())){
+            fileName = "病案首页不合格数病历详情页.xls";
+        }else{
+            fileName = "病案首页合格数病历详情页.xls";
+        }
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportNinetyByDeptDTO.class, fileName, response);
+        }
+   }
+
+    /**
+     * 缺陷详情-科室（分页）导出
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupExportByDeptPage(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
+        String fileName = "缺陷详情.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", DeptEntryNumDTO.class, fileName, response, 12.8f);
+    }
+
+
+    /**
+     *  各模块缺陷占比导出-科室
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupExportByDeptCase(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        String fileName = "各模块缺陷详情.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", NumDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     *  条目缺陷占比（内页）-科室
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupByEntryDeptPage(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryAndDeptInnerPage(filterPageByDeptVO);
+        String fileName = "条目缺陷占比详情.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", DeptEntryNumDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 缺陷详情质控评分页导出-科室
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public void qcResultShortByDeptPageExport(HttpServletResponse response,QcResultShortPageVO qcResultShortPageVO) {
+        filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
+        nineTytime(qcResultShortPageVO);
+        qcResultShortPageVO.setCurrent(1L);
+        qcResultShortPageVO.setSize(Long.MAX_VALUE);
+        qcResultShortPageVO.setSearchCount(false);
+        List<ExportExcelByDeptDTO> records = behospitalInfoFacade.qcResultShortByDeptPageExport(qcResultShortPageVO);
+        //带缺陷
+        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
+        if(ListUtil.isNotEmpty(records)){
+            ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setExportExcelByDeptDTOS(records);
+            resDTO.add(exportByDeptDTO);
+        }
+        String fileName = "缺陷详情质控评分.xls";
+        ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
+
+    }
+         public void nineTytime(QcResultShortPageVO qcResultShortPageVO){
+            Date startDate = qcResultShortPageVO.getStartDate();
+            Date endDate = qcResultShortPageVO.getEndDate();
+            //时间间隔90天
+            long interval = 90 * 24l * 60l * 60l * 1000l;
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+            }
+        };
+
+    /**
+     * 各科室缺陷占比-科室（组合）
+     *
+     * @param  filterOrderVO
+     * @return
+     */
+    public void levelByDeptExport(HttpServletResponse response,FilterOrderVO filterOrderVO) {
+        filterFacade.filterOrderVOSame(filterOrderVO);
+        List<LevelStsByDeptDTO> records = behospitalInfoFacade.levelStatisticsByDept(filterOrderVO);
+        if(ListUtil.isNotEmpty(records)){
+            for (LevelStsByDeptDTO record : records) {
+                BigDecimalStrExport(record);
+            }
+        }
+        String fileName = "各科室缺陷占比-科室.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", LevelStsByDeptDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 关键条目缺陷占比统计导出-科室
+     *
+     * @param  entryStatisticsVO
+     * @return
+     */
+    public void entryStatisticsByDeptExport(HttpServletResponse response,EntryStatisticsVO entryStatisticsVO) {
+        List<EntryStasByDeptDTO> records = behospitalInfoFacade.entryStatisticsByDept(entryStatisticsVO);
+        String fileName = "关键条目缺陷占比统计导出.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", EntryStasByDeptDTO.class, fileName, response, 12.8f);
+    }
+    /**
+     * 出院人数统计导出-科室
+     *
+     * @param  qcResultShortPageVO
+     * @return
+     */
+    public void leaveHosMrPageExportByDept(HttpServletResponse response,QcResultShortPageVO qcResultShortPageVO) {
+        solveParam(qcResultShortPageVO);
+        qcResultShortPageVO.setCurrent(1L);
+        qcResultShortPageVO.setSize(Long.MAX_VALUE);
+        qcResultShortPageVO.setSearchCount(false);
+        List<ExportExcelByDeptDTO> records = behospitalInfoFacade.leaveHosMRPageExportByDept(qcResultShortPageVO);
+        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
+        if(ListUtil.isNotEmpty(records)){
+            ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setExportExcelByDeptDTOS(records);
+            resDTO.add(exportByDeptDTO);
+        }
+
+        List<ExportNinetyByDeptDTO> resWide = new ArrayList<ExportNinetyByDeptDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
+        String fileName = "出院人数统计.xls";
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportNinetyByDeptDTO.class, fileName, response);
+        }
+    }
+    /**
+     * 质控核查统计导出-科室
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public void qcCheckStaExportByDept(HttpServletResponse response, FilterOrderVO filterOrderVO) {
+        List<ImproveByDeptDTO> record =consoleByDeptFacade.qcCheckStatisticsByDept(filterOrderVO);
+        ArrayList<ImproveExportByDeptDTO> records = new ArrayList<>();
+        ImproveExportByDeptDTO improveExportByDeptDTO = new ImproveExportByDeptDTO();
+        if(ListUtil.isNotEmpty(record)){
+            improveExportByDeptDTO.setDeptName(filterOrderVO.getDeptName());
+            improveExportByDeptDTO.setImproveByDeptDTOS(record);
+            records.add(improveExportByDeptDTO);
+        }
+
+        String fileName = "质控核查统计.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", ImproveExportByDeptDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     * 质控核查质控评分页-科室 导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public void qcCheckMRPageExportByDept(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
+        solveParam(qcResultShortPageVO);
+        qcResultShortPageVO.setCurrent(1L);
+        qcResultShortPageVO.setSize(Long.MAX_VALUE);
+        qcResultShortPageVO.setSearchCount(false);
+        List<ExportExcelByDeptDTO> records = behospitalInfoFacade.qcCheckMRPageExportByDept(qcResultShortPageVO);
+        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
+        if(ListUtil.isNotEmpty(records)){
+            ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
+            exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
+            exportByDeptDTO.setExportExcelByDeptDTOS(records);
+            resDTO.add(exportByDeptDTO);
+        }
+
+        List<ExportNinetyByDeptDTO> resWide = new ArrayList<ExportNinetyByDeptDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
+        String fileName = "质控核查质控评分详情.xls";
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportNinetyByDeptDTO.class, fileName, response);
+        }
+    }
+
+
+
+
+    public void solveParam(QcResultShortPageVO qcResultShortPageVO){
+       String hospitalId = SysUserUtils.getCurrentHospitalID();
+       qcResultShortPageVO.setHospitalId(hospitalId);
+       Date startDate = qcResultShortPageVO.getStartDate();
+       Date endDate = qcResultShortPageVO.getEndDate();
+       //时间间隔7天
+       long interval_7 = 7 * 24 * 60 * 60 * 1000;
+       long interval_90 = 90 * 24 * 60 * 60 * 1000;
+
+       if("1".equals(qcResultShortPageVO.getRadioCheck())){
+           //时间间隔7天
+           if (endDate.getTime() < startDate.getTime()) {
+               throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+           }
+           if (endDate.getTime() - startDate.getTime() > interval_7) {
+               throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+           }
+       }else{
+           //时间间隔90天
+           if (endDate.getTime() < startDate.getTime()) {
+               throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+           }
+           if (endDate.getTime() - startDate.getTime() > interval_90) {
+               throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+           }
+       }
+   }
+
+    public List<ExportNinetyByDeptDTO> transList(List<ExportExcelByDeptDTO>res, List<ExportNinetyByDeptDTO>resWide){
+        if(ListUtil.isNotEmpty(res)){
+            ExportNinetyByDeptDTO exportNinetyByDeptDTO = new ExportNinetyByDeptDTO();
+            List<ExportWideExcelByDeptDTO>exportWideExcelByDeptDTOs  =  new ArrayList<ExportWideExcelByDeptDTO>();
+            res.forEach(exportExcelByDeptDTO->{
+                ExportWideExcelByDeptDTO exportWideExcelByDeptDTO = new ExportWideExcelByDeptDTO();
+                exportWideExcelByDeptDTO.setAvgScore(exportExcelByDeptDTO.getAvgScore());
+                exportNinetyByDeptDTO.setBehDeptName( exportExcelByDeptDTO.getBehDeptName());
+                exportWideExcelByDeptDTO.setDoctorName(exportExcelByDeptDTO.getDoctorName());
+                List<ExportExcelBehByDeptDTO> exportExcelBehByDeptDTOS = exportExcelByDeptDTO.getExcelBehospitalDTOS();
+                List<ExportExcelWideBehByDeptDTO> exportExcelWideBehByDepDTOs = new ArrayList<>();
+
+                exportExcelBehByDeptDTOS.forEach(exportExcelBehByDeptDTO->{
+                    ExportExcelWideBehByDeptDTO exportExcelWideBehByDeptDTO = new ExportExcelWideBehByDeptDTO();
+                    exportExcelWideBehByDeptDTO.setBehospitalCode(exportExcelBehByDeptDTO.getBehospitalCode());
+                    exportExcelWideBehByDeptDTO.setBehospitalDate(exportExcelBehByDeptDTO.getBehospitalDate());
+                    exportExcelWideBehByDeptDTO.setLeaveHospitalDate(exportExcelBehByDeptDTO.getLeaveHospitalDate());
+                    exportExcelWideBehByDeptDTO.setPatName(exportExcelBehByDeptDTO.getPatName());
+                    exportExcelWideBehByDeptDTO.setScore(exportExcelBehByDeptDTO.getScore());
+                    exportExcelWideBehByDeptDTO.setScoreBn(exportExcelBehByDeptDTO.getScoreBn());
+                    exportExcelWideBehByDepDTOs.add(exportExcelWideBehByDeptDTO);
+                });
+                exportWideExcelByDeptDTO.setExcelBehospitalDTOS(exportExcelWideBehByDepDTOs);
+                exportWideExcelByDeptDTOs.add(exportWideExcelByDeptDTO);
+            });
+            exportNinetyByDeptDTO.setExportExcelByDeptDTOS(exportWideExcelByDeptDTOs);
+            resWide.add(exportNinetyByDeptDTO);
+        }
+        return resWide;
+    }
+
+    public void BigDecimalStrExport(LevelStsByDeptDTO record){
+
+        BigDecimal entrySameBigDecimal = getSubtract(new BigDecimal(record.getEntryNum()), new BigDecimal(record.getSameNum()  == null? 0:record.getSameNum()));
+
+        if(entrySameBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setEntryStrNum(record.getEntryNum()+"↑");
+        }else if(entrySameBigDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setEntryStrNum(record.getEntryNum()+"↓");
+        }
+
+        BigDecimal sameMrNumBigDecimal = getSubtract(new BigDecimal(record.getMrNum()), new BigDecimal(record.getSameMrNum()  == null? 0:record.getSameMrNum()));
+        if(sameMrNumBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setMrStrNum(record.getMrNum()+"↑");
+        }else if(sameMrNumBigDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setMrStrNum(record.getMrNum()+"↓");
+        }
+
+        BigDecimal sameAvgValueDecimal = getSubtract(new BigDecimal(record.getAverageValue()), new BigDecimal(record.getSameAvgValue() == null? 0:record.getSameAvgValue()));
+        if(sameAvgValueDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setAverageStrValue(record.getAverageValue()+"↑");
+        }else if(sameAvgValueDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setAverageStrValue(record.getAverageValue()+"↓");
+        }
+
+        BigDecimal SameFirstLevelBigDecimal = getSubtract(new BigDecimal(record.getFirstLevelNum()), new BigDecimal(record.getSameFirstLevelNum() == null? 0:record.getSameFirstLevelNum()));
+        if(SameFirstLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setFirstLevelStrNum(record.getFirstLevelNum()+"↑");
+        }else if(SameFirstLevelBigDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setFirstLevelStrNum(record.getFirstLevelNum()+"↓");
+        }
+
+        BigDecimal SameSecondLevelBigDecimal = getSubtract(new BigDecimal(record.getSecondLevelNum()), new BigDecimal(record.getSameSecondLevelNum() == null? 0:record.getSameSecondLevelNum()));
+        if(SameSecondLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setSecondLevelStrNum(record.getSecondLevelNum()+"↑");
+        }else if(SameSecondLevelBigDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setSecondLevelStrNum(record.getSecondLevelNum()+"↓");
+        }
+
+        BigDecimal SameThirdLevelBigDecimal = getSubtract(new BigDecimal(record.getThirdLevelNum()), new BigDecimal(record.getSameThirdLevelNum() == null? 0:record.getSameThirdLevelNum()));
+        if(SameThirdLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setThirdLevelStrNum(record.getThirdLevelNum()+"↑");
+        }else if(SameThirdLevelBigDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setThirdLevelStrNum(record.getThirdLevelNum()+"↓");
+        }
+
+        BigDecimal SameFirstLevelPeDecimal = getSubtract(new BigDecimal(record.getFirstLevelPercent()), new BigDecimal(record.getSameFirstLevelPercent() == null? 0:record.getSameFirstLevelPercent()));
+        if(SameFirstLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setFirstLevelPercentStr(record.getFirstLevelPercentStr()+"↑");
+        }else if(SameFirstLevelPeDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setFirstLevelPercentStr(record.getFirstLevelPercentStr()+"↓");
+        }
+
+        BigDecimal SameSecondLevelPeDecimal = getSubtract(new BigDecimal(record.getSecondLevelPercent()), new BigDecimal(record.getSameSecondLevelPercent() == null? 0:record.getSameSecondLevelPercent()));
+        if(SameSecondLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setSecondLevelPercentStr(record.getSecondLevelPercentStr()+"↑");
+        }else if(SameSecondLevelPeDecimal.compareTo(BigDecimal.ZERO)<0){
+            record.setSecondLevelPercentStr(record.getSecondLevelPercentStr()+"↓");
+        }
+
+        BigDecimal SameThirdLevelPeDecimal = getSubtract(new BigDecimal(record.getThirdLevelPercent()), new BigDecimal(record.getSameThirdLevelPercent() == null? 0:record.getSameThirdLevelPercent()));
+        if(SameThirdLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setThirdLevelPercentStr(record.getThirdLevelPercentStr()+"↑");
+        }else if(SameThirdLevelPeDecimal.compareTo(BigDecimal.ZERO) <0){
+            record.setThirdLevelPercentStr(record.getThirdLevelPercentStr()+"↓");
+        }
+    };
+
+    public void BigDecimalMethod(LevelStatisticsDTO record){
+        BigDecimal entrySameBigDecimal = getSubtract(new BigDecimal(record.getEntryNum()), new BigDecimal(record.getSameNum() == null? 0:record.getSameNum()));
+
+        if(entrySameBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setEntrySameNum(1);
+        }else if(entrySameBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setEntrySameNum(0);
+        }else{
+            record.setEntrySameNum(-1);
+        }
+
+        BigDecimal sameMrNumBigDecimal = getSubtract(new BigDecimal(record.getMrNum()), new BigDecimal(record.getSameMrNum()  == null? 0:record.getSameMrNum()));
+        if(sameMrNumBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setMrSameNum(1);
+        }else if(sameMrNumBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setMrSameNum(0);
+        }else{
+            record.setMrSameNum(-1);
+        }
+
+        BigDecimal sameAvgValueDecimal = getSubtract(new BigDecimal(record.getAverageValue()), new BigDecimal(record.getSameAvgValue() == null? 0:record.getSameAvgValue()));
+        if(sameAvgValueDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setAvSameValue(1);
+        }else if(sameAvgValueDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setAvSameValue(0);
+        }else{
+            record.setAvSameValue(-1);
+        }
+
+        BigDecimal SameFirstLevelBigDecimal = getSubtract(new BigDecimal(record.getFirstLevelNum()), new BigDecimal(record.getSameFirstLevelNum() == null? 0:record.getSameFirstLevelNum()));
+        if(SameFirstLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setFirSameLevelNum(1);
+        }else if(SameFirstLevelBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setFirSameLevelNum(0);
+        }else{
+            record.setFirSameLevelNum(-1);
+        }
+
+        BigDecimal SameSecondLevelBigDecimal = getSubtract(new BigDecimal(record.getSecondLevelNum()), new BigDecimal(record.getSameSecondLevelNum() == null? 0:record.getSameSecondLevelNum()));
+        if(SameSecondLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setSecSameLevelNum(1);
+        }else if(SameSecondLevelBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setSecSameLevelNum(0);
+        }else{
+            record.setSecSameLevelNum(-1);
+        }
+
+        BigDecimal SameThirdLevelBigDecimal = getSubtract(new BigDecimal(record.getThirdLevelNum()), new BigDecimal(record.getSameThirdLevelNum() == null? 0:record.getSameThirdLevelNum()));
+        if(SameThirdLevelBigDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setThiSameLevelNum(1);
+        }else if(SameThirdLevelBigDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setThiSameLevelNum(0);
+        }else{
+            record.setThiSameLevelNum(-1);
+        }
+
+        BigDecimal SameFirstLevelPeDecimal = getSubtract(new BigDecimal(record.getFirstLevelPercent()), new BigDecimal(record.getSameFirstLevelPercent() == null? 0:record.getSameFirstLevelPercent()));
+        if(SameFirstLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setFirSameLevelPercent(1);
+        }else if(SameFirstLevelPeDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setFirSameLevelPercent(0);
+        }else{
+            record.setFirSameLevelPercent(-1);
+        }
+
+        BigDecimal SameSecondLevelPeDecimal = getSubtract(new BigDecimal(record.getSecondLevelPercent()), new BigDecimal(record.getSameSecondLevelPercent() == null? 0:record.getSameSecondLevelPercent()));
+        if(SameSecondLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setSecSameLevelPercent(1);
+        }else if(SameSecondLevelPeDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setSecSameLevelPercent(0);
+        }else{
+            record.setSecSameLevelPercent(-1);
+        }
+
+        BigDecimal SameThirdLevelPeDecimal = getSubtract(new BigDecimal(record.getThirdLevelPercent()), new BigDecimal(record.getSameThirdLevelPercent() == null? 0:record.getSameThirdLevelPercent()));
+        if(SameThirdLevelPeDecimal.compareTo(BigDecimal.ZERO)>0){
+            record.setThiSameLevelPercent(1);
+        }else if(SameThirdLevelPeDecimal.compareTo(BigDecimal.ZERO) == 0){
+            record.setThiSameLevelPercent(0);
+        }else{
+            record.setThiSameLevelPercent(-1);
+        }
+    };
+
+    /**
+     * 差值计算
+     *
+     * @param bigDecimalOne
+     * @param bigDecimalTwo
+     * @return
+     */
+    private BigDecimal getSubtract(BigDecimal bigDecimalOne, BigDecimal bigDecimalTwo) {
+        BigDecimal newBigDecimal = new BigDecimal(0);
+        if (null == bigDecimalOne && null != bigDecimalTwo) {
+            newBigDecimal = newBigDecimal.subtract(bigDecimalTwo);
+        } else if (null != bigDecimalOne && null == bigDecimalTwo) {
+            newBigDecimal = bigDecimalOne.subtract(newBigDecimal);
+        } else if (null != bigDecimalOne && null != bigDecimalTwo) {
+            newBigDecimal = bigDecimalOne.subtract(bigDecimalTwo);
+        }
+        return newBigDecimal;
+    }
+
+
+}

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -1,36 +1,22 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.DeptBaseDTO;
-import com.diagbot.dto.DeptEntryNumDTO;
-import com.diagbot.dto.DeptNumDTO;
-import com.diagbot.dto.HomePageNumDTO;
-import com.diagbot.dto.LevelStatisticsDTO;
-import com.diagbot.dto.NumDTO;
-import com.diagbot.dto.QcResultShortDTO;
+import com.diagbot.dto.*;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.FilterOrderByDeptVO;
-import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcResultShortPageVO;
-import com.diagbot.vo.QcresultFilterVO;
+import com.diagbot.vo.*;
 import com.google.common.collect.Lists;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -71,34 +57,32 @@ public class ConsoleByDeptFacade {
         Map<String, NumDTO> totleMap = ListUtil.isEmpty(totleNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(totleNumList, "name");
-        //新生儿人数
-        List<NumDTO> newBornNumList = behospitalInfoFacade.newBornCountByDept(filterVO);
-        Map<String, NumDTO> newBornMap = ListUtil.isEmpty(newBornNumList)
-                ? new HashMap<>()
-                : EntityUtil.makeEntityMap(newBornNumList, "name");
-        //死亡人数
-        List<NumDTO> deathNumList = behospitalInfoFacade.deathCountByDept(filterVO);
-        Map<String, NumDTO> deathMap = ListUtil.isEmpty(deathNumList)
-                ? new HashMap<>()
-                : EntityUtil.makeEntityMap(deathNumList, "name");
-        //手术人数
-        List<NumDTO> operationNumList = behospitalInfoFacade.operationCountByDept(filterVO);
-        Map<String, NumDTO> operationMap = ListUtil.isEmpty(operationNumList)
-                ? new HashMap<>()
-                : EntityUtil.makeEntityMap(operationNumList, "name");
+        Map<String, NumDTO> deathMap = new HashMap<>();
+        Map<String, NumDTO> operationMap = new HashMap<>();
+        //终末--死亡人数/手术病人数
+            //死亡人数
+            List<NumDTO> deathNumList = behospitalInfoFacade.deathCountByDept(filterVO);
+             deathMap = ListUtil.isEmpty(deathNumList)
+                    ? new HashMap<>()
+                    : EntityUtil.makeEntityMap(deathNumList, "name");
+            //手术人数
+            List<NumDTO> operationNumList = behospitalInfoFacade.operationCountByDept(filterVO);
+             operationMap = ListUtil.isEmpty(operationNumList)
+                    ? new HashMap<>()
+                    : EntityUtil.makeEntityMap(operationNumList, "name");
+
         for (String deptName : deptMap.keySet()) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("总人数", 0);
             map.put("死亡人数", 0);
             map.put("手术病人数", 0);
-
             if (totleMap.containsKey(deptName)) {
                 map.put("总人数", totleMap.get(deptName).getNum());
             }
-            if (deathMap.containsKey(deptName)) {
+            if(deathMap.containsKey(deptName)) {
                 map.put("死亡人数", deathMap.get(deptName).getNum());
             }
-            if (operationMap.containsKey(deptName)) {
+            if(operationMap.containsKey(deptName)) {
                 map.put("手术病人数", operationMap.get(deptName).getNum());
             }
             retMap.put(deptName, map);
@@ -106,6 +90,21 @@ public class ConsoleByDeptFacade {
         return retMap;
     }
 
+
+    /**
+     * 入院人数统计-按科室
+     *
+     * @param filterVO
+     * @return
+     */
+    public Map<String, List<AdmissionCountDTO>> admissionHosCountByDept(FilterVO filterVO) {
+        filterFacade.filterVOSet(filterVO);
+        List<AdmissionCountDTO> totleNumList = behospitalInfoFacade.admissionHosCountByDept(filterVO);
+        Map<String, List<AdmissionCountDTO>> resourceData = mapResource(filterVO, totleNumList);
+        return resourceData;
+    }
+
+
     /**
      * 病历数统计-按科室
      *
@@ -392,7 +391,7 @@ public class ConsoleByDeptFacade {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
+    public IPage<NumDTO> entryCountGroupByCaseAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
         if (StringUtil.isBlank(filterPageByDeptVO.getDeptName())) {
             List<DeptBaseDTO> deptList = this.getDept();
             //默认取第一个科室
@@ -401,7 +400,7 @@ public class ConsoleByDeptFacade {
             }
         }
         filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
-        IPage<DeptNumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
+        IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return page;
     }
 
@@ -468,19 +467,19 @@ public class ConsoleByDeptFacade {
     /**
      * 各科室缺陷占比（组合）
      *
-     * @param filterOrderByDeptVO
+     * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO) {
+    public List<LevelStsByDeptDTO> levelStatisticsByDept(FilterOrderVO filterOrderVO) {
         List<DeptBaseDTO> deptList = getDept();
         if (ListUtil.isEmpty(deptList)) {
             return null;
         }
-        if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
-            filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
+        if (StringUtil.isBlank(filterOrderVO.getDeptName())) {
+            filterOrderVO.setDeptName(deptList.get(0).getDeptName());
         }
-        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
-        List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDept(filterOrderByDeptVO);
+        filterFacade.filterOrderVOSame(filterOrderVO);
+        List<LevelStsByDeptDTO> records = behospitalInfoFacade.levelStatisticsByDept(filterOrderVO);
         return records;
     }
 
@@ -490,7 +489,7 @@ public class ConsoleByDeptFacade {
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO) {
+    public List<HomePageByDeptDTO> homePageLevelStatisticsByDept(FilterOrderByDeptVO filterOrderByDeptVO) {
         List<DeptBaseDTO> deptList = getDept();
         if (ListUtil.isEmpty(deptList)) {
             return null;
@@ -499,25 +498,81 @@ public class ConsoleByDeptFacade {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
         filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
-        List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
-        //没有医生过滤时增加全科室数据
-        if (StringUtil.isBlank(filterOrderByDeptVO.getName())
-                || filterOrderByDeptVO.getName().equals(filterOrderByDeptVO.getDeptName())) {
-            HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
+        List<HomePageByDeptDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
+        //没有医生过滤时增加全科室数据 --暂时不做汇总处理
+       /* if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())
+                || filterOrderByDeptVO.getDeptName().equals(filterOrderByDeptVO.getDeptName())) {
+            HomePageByDeptDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
             if (item != null) {
                 records.add(0, item);
             }
-        }
+        }*/
         return records;
     }
 
+    /**
+     * 单条条目缺陷统计（首页）
+     *
+     * @param filterVO
+     * @return
+     */
+    public  Map<String, List<AdmissionCountDTO>>casesEntryStatisticsByDept(FilterVO filterVO) {
+        filterFacade.filterVOSet(filterVO);
+        List<AdmissionCountDTO> totleNumList = behospitalInfoFacade.casesEntryStatisticsByDept(filterVO);
+        Map<String, List<AdmissionCountDTO>> resourceData = mapResource(filterVO, totleNumList);
+        return resourceData;
+    }
+
+    public Map<String, List<AdmissionCountDTO>> mapResource(FilterVO filterVO,List<AdmissionCountDTO>totleNumList){
+        Map<String, Object> deptMap = getDeptByUser(filterVO);
+            Map<String, List<AdmissionCountDTO>> mapSource = new HashMap<>();
+            Map<String, List<AdmissionCountDTO>> returnSource = new HashMap<>();
+            if (deptMap == null) {
+                return mapSource;
+            }
+
+            if(ListUtil.isNotEmpty(totleNumList)) {
+                mapSource = EntityUtil.makeEntityListMap(totleNumList, "deptName");
+                for (String deptName : deptMap.keySet()) {
+                    List<AdmissionCountDTO> admissionCountDTOS = mapSource.get(deptName);
+                if(ListUtil.isNotEmpty(admissionCountDTOS) ){
+//                    if ( admissionCountDTOS.size()> filterVO.getLimitCount()) {
+//                        admissionCountDTOS = admissionCountDTOS.subList(0, 10);
+//                      }
+                    AdmissionCountDTO admissionCount = new AdmissionCountDTO();
+                    Integer tolCount = admissionCountDTOS.stream()
+                            .map(AdmissionCountDTO::getNum)
+                            .reduce(0, Integer::sum);
+                    admissionCount.setDoctorName(deptName);
+                    admissionCount.setNum(tolCount);
+                    admissionCountDTOS.add(0, admissionCount);
+                    returnSource.put(deptName,admissionCountDTOS);
+                    }
+                }
+            }
+            return returnSource;
+        }
+    /**
+     * 不合格/合格数病历号-科室（内页）
+     *
+     * @param qcResultPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> homePageOrGoodLevelByDept(QcResultPageVO qcResultPageVO) {
+        filterFacade.OrGoodLevelPageVOSet(qcResultPageVO);
+        return behospitalInfoFacade.getOrGoodLevelByDept(qcResultPageVO);
+    }
+
+
+
+
     /**
      * 病案首页合格率占比（首页）
      *
      * @param filterOrderByDeptVO
      * @return
      */
-    public List<HomePageNumDTO> homePageLevelByDeptLimit(FilterOrderByDeptVO filterOrderByDeptVO) {
+    public List<HomePageByDeptDTO> homePageLevelByDeptLimit(FilterOrderByDeptVO filterOrderByDeptVO) {
 
         List<DeptBaseDTO> deptList = getDept();
         if (ListUtil.isEmpty(deptList)) {
@@ -530,8 +585,8 @@ public class ConsoleByDeptFacade {
         if (filterOrderByDeptVO.getLimitCount() == null || filterOrderByDeptVO.getLimitCount().equals(0)) {
             filterOrderByDeptVO.setLimitCount(10);
         }
-        List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
-        HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
+        List<HomePageByDeptDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
+        HomePageByDeptDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
         if (item != null) {
             records.add(0, item);
         }
@@ -551,13 +606,13 @@ public class ConsoleByDeptFacade {
      * @param deptName
      * @return
      */
-    public HomePageNumDTO getGlobleRecord(List<HomePageNumDTO> records, String deptName) {
+    public HomePageByDeptDTO getGlobleRecord(List<HomePageByDeptDTO> records, String deptName) {
         DecimalFormat df = new DecimalFormat("#0.00");
-        HomePageNumDTO item = new HomePageNumDTO();
+        HomePageByDeptDTO item = new HomePageByDeptDTO();
         //总病历数
         Integer mrNum = records
                 .stream()
-                .map(HomePageNumDTO::getMrNum)
+                .map(HomePageByDeptDTO::getMrNum)
                 .reduce(0, Integer::sum);
         if (mrNum == null || mrNum == 0) {
             return null;
@@ -565,7 +620,7 @@ public class ConsoleByDeptFacade {
         //总缺陷数
         Integer entryNum = records
                 .stream()
-                .map(HomePageNumDTO::getEntryNum)
+                .map(HomePageByDeptDTO::getEntryNum)
                 .reduce(0, Integer::sum);
         //总分
         Double totleValue = records
@@ -580,7 +635,7 @@ public class ConsoleByDeptFacade {
         //合格病历总数
         Integer firstLevelNum = records
                 .stream()
-                .map(HomePageNumDTO::getFirstLevelNum)
+                .map(HomePageByDeptDTO::getFirstLevelNum)
                 .reduce(0, Integer::sum);
         //合格病历占比
         Double firstLevelPercent = BigDecimal.valueOf(firstLevelNum)
@@ -591,7 +646,7 @@ public class ConsoleByDeptFacade {
         //不合格病历数
         Integer secondLevelNum = records
                 .stream()
-                .map(HomePageNumDTO::getSecondLevelNum)
+                .map(HomePageByDeptDTO::getSecondLevelNum)
                 .reduce(0, Integer::sum);
         //不合格病历占比
         Double secondLevelPercent = BigDecimal.valueOf(secondLevelNum)
@@ -602,12 +657,12 @@ public class ConsoleByDeptFacade {
         //条目缺陷总数（模块下条目*病历数）
         Integer entryTotleNum = records
                 .stream()
-                .map(HomePageNumDTO::getEntryTotleNum)
+                .map(HomePageByDeptDTO::getEntryTotleNum)
                 .reduce(0, Integer::sum);
         //空项总数
         Integer emptyNum = records
                 .stream()
-                .map(HomePageNumDTO::getEmptyNum)
+                .map(HomePageByDeptDTO::getEmptyNum)
                 .reduce(0, Integer::sum);
         Double emptyPercent = BigDecimal.valueOf(entryTotleNum - emptyNum)
                 .divide(BigDecimal.valueOf(entryTotleNum), 4, RoundingMode.HALF_UP)
@@ -617,7 +672,7 @@ public class ConsoleByDeptFacade {
         //错误项总数
         Integer errorNum = records
                 .stream()
-                .map(HomePageNumDTO::getErrorNum)
+                .map(HomePageByDeptDTO::getErrorNum)
                 .reduce(0, Integer::sum);
         Double errorPercent = BigDecimal.valueOf(entryTotleNum - errorNum)
                 .divide(BigDecimal.valueOf(entryTotleNum), 4, RoundingMode.HALF_UP)
@@ -626,6 +681,7 @@ public class ConsoleByDeptFacade {
                 = df.format(BigDecimal.valueOf(errorPercent).multiply(BigDecimal.valueOf(100))) + "%";
 
         item.setDoctorName(deptName);
+//        item.setDeptId(deptId);
         item.setEntryNum(entryNum);
         item.setMrNum(mrNum);
         item.setTotleValue(totleValue);
@@ -657,4 +713,55 @@ public class ConsoleByDeptFacade {
         IPage<QcResultShortDTO> page = behospitalInfoFacade.qcResultShortByDeptPage(qcResultShortPageVO);
         return page;
     }
-}
+
+
+    /**
+     * 关键条目缺陷占比统计-科室
+     *
+     * @param entryStatisticsVO
+     * @return
+     */
+    public List<EntryStasByDeptDTO> entryStatisticsByDept(EntryStatisticsVO entryStatisticsVO) {
+        filterFacade.entryStatisticsVOSet(entryStatisticsVO);
+        if (entryStatisticsVO.getDeptName().equals("全院")) {
+            entryStatisticsVO.setDeptName("");
+        }
+        List<EntryStasByDeptDTO> records = behospitalInfoFacade.entryStatisticsByDept(entryStatisticsVO);
+        return records;
+    }
+
+    /**
+     * 离院病人质控评分详情页-科室
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> leaveHosMRPageByDept(QcResultShortPageVO qcResultShortPageVO) {
+        filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
+        IPage<QcResultShortDTO> page = behospitalInfoFacade.leaveHosMRPageByDept(qcResultShortPageVO);
+        return page;
+    }
+
+    /**
+     * 质控核查统计-科室（内页）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<ImproveByDeptDTO> qcCheckStatisticsByDept(FilterOrderVO filterOrderVO) {
+        filterFacade.filterOrderVOSet(filterOrderVO);
+        List<ImproveByDeptDTO> records = behospitalInfoFacade.qcCheckStatisticsByDept(filterOrderVO);
+        return records;
+    }
+    /**
+     * 质控核查质控评分页-科室（内页）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    public IPage<QcResultShortDTO> qcCheckMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
+        filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
+        return behospitalInfoFacade.qcCheckMRPageByDept(qcResultShortPageVO);
+    }
+
+}

src/main/java/com/diagbot/facade/ConsoleExportFacade.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -222,14 +223,14 @@ public class ConsoleExportFacade {
     public void qcResultShortPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔90天
-        long interval = 90l * 24l * 60l * 60l * 1000l;
+        long interval = 90 * 24l * 60l * 60l * 100l;
         if (endDate.getTime() < startDate.getTime()) {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
         }
@@ -254,27 +255,75 @@ public class ConsoleExportFacade {
     public void leaveHosMrPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
-        long interval = 7 * 24 * 60 * 60 * 1000;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+        long interval_7 = 7 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            //时间间隔7天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_7) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+            }
+        }else{
+            //时间间隔90天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_90) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+            }
         }
 
         qcResultShortPageVO.setCurrent(1L);
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.leaveHosMRPageExport(qcResultShortPageVO);
+        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
         String fileName = "出院人数统计.xls";
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+          if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
+        }
+    }
+
+    public List<ExportWideExcelDTO> transList(List<ExportExcelDTO>res, List<ExportWideExcelDTO>resWide){
+        if(ListUtil.isNotEmpty(res)){
+            res.forEach(exportExcelDTO->{
+                ExportWideExcelDTO exportWideExcelDTO = new ExportWideExcelDTO();
+                exportWideExcelDTO.setAvgScore(exportExcelDTO.getAvgScore());
+                exportWideExcelDTO.setBehDeptName(exportExcelDTO.getBehDeptName());
+                List<ExportExcelBehospitalDTO> excelBehospitalDTOS = exportExcelDTO.getExcelBehospitalDTOS();
+                List<ExportExcelWideBehospitalDTO> exportExcelWideBehospitalDTOs = new ArrayList<>();
+                excelBehospitalDTOS.forEach(exportExcelBehospitalDTO->{
+                    ExportExcelWideBehospitalDTO exportExcelWideBehospitalDTO = new ExportExcelWideBehospitalDTO();
+                    exportExcelWideBehospitalDTO.setDoctorName(exportExcelBehospitalDTO.getDoctorName());
+                    exportExcelWideBehospitalDTO.setBehospitalCode(exportExcelBehospitalDTO.getBehospitalCode());
+                    exportExcelWideBehospitalDTO.setBehospitalDate(exportExcelBehospitalDTO.getBehospitalDate());
+                    exportExcelWideBehospitalDTO.setLeaveHospitalDate(exportExcelBehospitalDTO.getLeaveHospitalDate());
+                    exportExcelWideBehospitalDTO.setPatName(exportExcelBehospitalDTO.getPatName());
+                    exportExcelWideBehospitalDTO.setScore(exportExcelBehospitalDTO.getScore());
+                    exportExcelWideBehospitalDTO.setScoreBn(exportExcelBehospitalDTO.getScoreBn());
+                    exportExcelWideBehospitalDTOs.add(exportExcelWideBehospitalDTO);
+                });
+                exportWideExcelDTO.setExcelBehospitalDTOS(exportExcelWideBehospitalDTOs);
+                resWide.add(exportWideExcelDTO);
+            });
+        }
+        return resWide;
     }
 
     /**
@@ -298,14 +347,14 @@ public class ConsoleExportFacade {
     public void unModifyMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
-        long interval = 90l * 24l * 60l * 60l * 1000l;
+        long interval = 90 * 24l * 60l * 60l * 1000l;
         if (endDate.getTime() < startDate.getTime()) {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
         }
@@ -330,34 +379,55 @@ public class ConsoleExportFacade {
     public void badLevelPagePageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
-        long interval = 90l * 24l * 60l * 60l * 1000l;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+        long interval_7 = 7 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            //时间间隔7天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_7) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+            }
+        }else{
+            //时间间隔90天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_90) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+            }
         }
 
         qcResultShortPageVO.setCurrent(1L);
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.badLevelPagePageExport(qcResultShortPageVO);
+        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
         String fileName = null;
         if("不合格数".equals(qcResultShortPageVO.getTitleName())){
-             fileName = "病案首页不合格数病历详情页.xls";
+            fileName = "病案首页不合格数病历详情页.xls";
         }else{
-             fileName = "病案首页合格数病历详情页.xls";
+            fileName = "病案首页合格数病历详情页.xls";
         }
-
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
-    }
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
+        }
+   }
 
     /**
      * 未整改病历统计导出
@@ -368,7 +438,7 @@ public class ConsoleExportFacade {
     public void unModifyMRStatisticsExport(HttpServletResponse response, FilterUnModifyMRVO filterUnModifyMRVO) {
         filterFacade.filterUnModifyMRVOSet(filterUnModifyMRVO);
         List<ExcelExportEntity> colList = Lists.newLinkedList();
-        ExcelExportEntity deptNameCol = new ExcelExportEntity("科室名称", "deptName");
+        ExcelExportEntity deptNameCol = new ExcelExportEntity("科室", "deptName");
         deptNameCol.setWidth(50);
         colList.add(deptNameCol);
 
@@ -428,27 +498,49 @@ public class ConsoleExportFacade {
     public void hmImproveMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+    if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
-        long interval = 7 * 24 * 60 * 60 * 1000;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+        long interval_7 = 7 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            //时间间隔7天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_7) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+            }
+        }else{
+            //时间间隔90天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_90) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+            }
         }
 
         qcResultShortPageVO.setCurrent(1L);
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.hmImproveMRPageExport(qcResultShortPageVO);
+        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
         String fileName = "病案首页改善率评分病历导出.xls";
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
+        }
     }
 
     /**
@@ -460,26 +552,49 @@ public class ConsoleExportFacade {
     public void qcCheckMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getBehDeptName())
-                && qcResultShortPageVO.getBehDeptName().equals("全部")) {
-            qcResultShortPageVO.setBehDeptName("");
+        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
+                && qcResultShortPageVO.getDeptName().equals("全部")) {
+            qcResultShortPageVO.setDeptName("");
         }
         Date startDate = qcResultShortPageVO.getStartDate();
         Date endDate = qcResultShortPageVO.getEndDate();
+
         //时间间隔7天
-        long interval = 7 * 24 * 60 * 60 * 1000;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+        long interval_7 = 7 * 24 * 60 * 60 * 1000;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
+
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            //时间间隔7天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_7) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
+            }
+        }else{
+            //时间间隔90天
+            if (endDate.getTime() < startDate.getTime()) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
+            }
+            if (endDate.getTime() - startDate.getTime() > interval_90) {
+                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
+            }
         }
 
         qcResultShortPageVO.setCurrent(1L);
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.qcCheckMRPageExport(qcResultShortPageVO);
+        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            resWide = transList(records, resWide);
+        }
         String fileName = "质控核查病历导出.xls";
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        if("1".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
+        }
+        if("2".equals(qcResultShortPageVO.getRadioCheck())){
+            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
+        }
     }
 }

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -584,7 +584,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             LevelStatisticsDTO item = getGlobleTitle(records);
             if (item != null) {
                 records.add(0, item);
@@ -608,7 +608,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             LevelStatisticsDTO item = getGlobleTitle(records);
             if (item != null) {
                 records.add(0, item);
@@ -817,7 +817,7 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptStr_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-        if( StringUtil.isBlank(filterOrderVO.getName())){
+        if( StringUtil.isBlank(filterOrderVO.getDeptName())){
             LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
             if (item != null) {
                 records.add(0, item);
@@ -841,7 +841,7 @@ public class ConsoleFacade {
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
-            if( StringUtil.isBlank(filterOrderVO.getName())){
+            if( StringUtil.isBlank(filterOrderVO.getDeptName())){
                 LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
                 if (item != null) {
                     records.add(0, item);
@@ -1236,7 +1236,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             HomePageNumDTO item = getGlobleRecord(records);
             if (item != null) {
                 records.add(0, item);
@@ -1591,7 +1591,7 @@ public class ConsoleFacade {
         filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageImproveDTO> records = behospitalInfoFacade.qcCheckStatistics(filterOrderVO);
         //增加全院数据
-        if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
             HomePageImproveDTO item = getGlobleRecord_improve(records);
             if (item != null) {
                 records.add(0, item);
@@ -1731,7 +1731,7 @@ public class ConsoleFacade {
         ColumnDTO columnDeptName = new ColumnDTO();
         columnDeptName.setOrderNo(orderNo);
         columnDeptName.setFieldName("deptName");
-        columnDeptName.setColumnName("科室名称");
+        columnDeptName.setColumnName("科室");
         columnDeptName.setIsShow(1);
         columns.add(columnDeptName);
         orderNo++;
@@ -1873,8 +1873,8 @@ public class ConsoleFacade {
         });
         //增加全院数据
         if (ListUtil.isNotEmpty(retList) &&
-                (StringUtil.isBlank(filterUnModifyMRVO.getName())
-                        || filterUnModifyMRVO.getName().equals("全院"))) {
+                (StringUtil.isBlank(filterUnModifyMRVO.getDeptName())
+                        || filterUnModifyMRVO.getDeptName().equals("全院"))) {
             try {
 
                 Object globleObj = new Object();

src/main/java/com/diagbot/facade/FilterFacade.java

@@ -387,12 +387,29 @@ public class FilterFacade {
         String userId = SysUserUtils.getCurrentPrincipleID();
         qcResultPageVO.setHospitalId(hospitalId);
         qcResultPageVO.setUserId(Long.valueOf(userId));
-        if (qcResultPageVO.getBehDeptName().equals("全院")|| StringUtils.isEmpty(qcResultPageVO.getBehDeptName())) {
-            qcResultPageVO.setBehDeptName("");
+        if (qcResultPageVO.getDeptName().equals("全院")|| StringUtils.isEmpty(qcResultPageVO.getDeptName())) {
+            qcResultPageVO.setDeptName("");
         }
         /*long interval = qcResultShortPageVO.getEndDate().getTime() + 1000;
         qcResultShortPageVO.setEndDate(new Date(Long.valueOf(interval)));*/
     }
+    /**
+     * 合格/不合格数病历号入参拼接-科室
+     *
+     * @param qcResultPageVO
+     */
+    public void OrGoodLevelPageVOSet(QcResultPageVO qcResultPageVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        qcResultPageVO.setHospitalId(hospitalId);
+        qcResultPageVO.setUserId(Long.valueOf(userId));
+        if (StringUtils.isEmpty(qcResultPageVO.getDoctorId())) {
+            qcResultPageVO.setDoctorName("");
+        }
+        /*long interval = qcResultShortPageVO.getEndDate().getTime() + 1000;
+        qcResultShortPageVO.setEndDate(new Date(Long.valueOf(interval)));*/
+    }
+
 
     /**
      * 关键条目缺陷占比入参拼接

src/main/java/com/diagbot/facade/MedBloodTransfusionFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedBloodTransfusionServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
-}

src/main/java/com/diagbot/facade/MedConsultationApplyFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedConsultationApplyFacade extends MedConsultationApplyServiceImpl {
-}

src/main/java/com/diagbot/facade/MedConsultationNoteFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
-import com.diagbot.service.impl.MedConsultationNoteServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
-}

src/main/java/com/diagbot/facade/MedConsultationResultFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
-import com.diagbot.service.impl.MedConsultationResultServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedConsultationResultFacade extends MedConsultationResultServiceImpl {
-}

src/main/java/com/diagbot/facade/MedCrisisNoteFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedCrisisNoteServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
-}

src/main/java/com/diagbot/facade/MedDeathDiscussionFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedDeathDiscussionServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
-}

src/main/java/com/diagbot/facade/MedDeathNoteFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedDeathNoteServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedDeathNoteFacade extends MedDeathNoteServiceImpl {
-}

src/main/java/com/diagbot/facade/MedDifficultCaseFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedDeathNoteServiceImpl;
-import com.diagbot.service.impl.MedDifficultCaseServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedDifficultCaseFacade extends MedDifficultCaseServiceImpl {
-}

src/main/java/com/diagbot/facade/MedFirstRecordFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedFirstRecordServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedFirstRecordFacade extends MedFirstRecordServiceImpl {
-}

src/main/java/com/diagbot/facade/MedIllCriticallyFacade.java

@@ -1,14 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedIllCriticallyServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: cy
- * @time: 2020/9/23 11:39
- */
-@Component
-public class MedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
-}