Merge branch 'master' into his/yiwufuyou

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
#	src/main/java/com/diagbot/entity/MedAbnormalInfo.java
#	src/main/java/com/diagbot/entity/MedLisResult.java
#	src/main/java/com/diagbot/entity/MedPacsResult.java
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ABasDeptInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ABasDoctorInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java
#	src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomePageFacade.java
#	src/main/java/com/diagbot/facade/data/AMedAbnormalInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java
#	src/main/java/com/diagbot/facade/data/AMedLisResultFacade.java
#	src/main/java/com/diagbot/facade/data/AMedPacsResultFacade.java
#	src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java
#	src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java
#	src/main/java/com/diagbot/mapper/MedPacsResultMapper.java
#	src/main/java/com/diagbot/service/impl/MedPacsResultServiceImpl.java
#	src/main/java/com/diagbot/util/TZDBConn.java
#	src/main/java/com/diagbot/vo/data/ADeleteFlagVO.java
#	src/main/java/com/diagbot/vo/data/AMrContentVO.java
#	src/main/java/com/diagbot/vo/data/APlaceFileVO.java
#	src/main/java/com/diagbot/web/DataController.java
#	src/main/resources/mapper/MedLisResultMapper.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/025.20201021v1.4.7/qc_initv1.4.7.sql

@@ -0,0 +1,2 @@
+use `qc`;
+INSERT INTO `qc`.`sys_dictionary_info`( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 3, 'anaesthesiaDoctor', '麻醉医师', 2, 0, '病案首页手术信息');

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`;

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

@@ -274,26 +274,45 @@ public class AverageStatisticsAggregate {
         if (averageList.size() <= limitCount) {
             retAverageList = BeanUtil.listCopyTo(averageList, AverageStatisticsDTO.class);
         } else {
-            retAverageList = averageList.subList(0, limitCount - 1);
-            List<AverageStatisticsDTO> otherList = averageList.subList(limitCount - 1, averageList.size());
+            retAverageList = averageList.subList(0, limitCount - 2);
+            List<AverageStatisticsDTO> otherList = averageList.subList(limitCount - 2, averageList.size());
             Double totleValue = otherList
                     .stream()
                     .map(i -> BigDecimal.valueOf(i.getTotleValue()))
                     .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+            Double sameTotleValue = otherList
+                    .stream()
+                    .map(i -> BigDecimal.valueOf(i.getSameTotleValue()))
+                    .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
             Integer num = otherList
                     .stream()
                     .map(AverageStatisticsDTO::getNum)
                     .reduce(0, Integer::sum);
+            Integer sameNum = otherList
+                    .stream()
+                    .map(AverageStatisticsDTO::getSameNum)
+                    .reduce(0, Integer::sum);
             Double averageValue = BigDecimal.valueOf(totleValue)
                     .divide(BigDecimal.valueOf(num), 2, RoundingMode.HALF_UP)
                     .doubleValue();
+            Double lastYearAverageValue = 0d;
+            if(0 != sameNum){
+                 lastYearAverageValue = BigDecimal.valueOf(sameTotleValue)
+                        .divide(BigDecimal.valueOf(sameNum), 2, RoundingMode.HALF_UP)
+                        .doubleValue();
+            }
+
+
             AverageStatisticsDTO retAverageStatistics = new AverageStatisticsDTO();
             retAverageStatistics.setName("其他");
             retAverageStatistics.setNum(num);
+            retAverageStatistics.setSameNum(sameNum);
+            retAverageStatistics.setSameTotleValue(sameTotleValue);
+            retAverageStatistics.setLastYearAverageValue(lastYearAverageValue);
             retAverageStatistics.setAverageValue(averageValue);
             retAverageStatistics.setTotleValue(totleValue);
             retAverageList.add(retAverageStatistics);
         }
         return retAverageList;
     }
-}
+}

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

@@ -161,7 +161,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/placeFile").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()
-                .antMatchers("/qc/hl7/Run").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()

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

@@ -205,7 +205,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/placeFile", request)
                 || matchers("/qc/data/sendLisResults", request)
                 || matchers("/qc/data/sendPacsResults", request)
-                || matchers("/qc/hl7/Run", 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)

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

@@ -13,12 +13,14 @@ 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;
+    private Integer num = 0;
+    private Integer sameNum = 0; //同期num
     @Excel(name = "本年平均住院天数（天）", width = 15, orderNum = "2")
     private Double averageValue = 0d;
     private Double totleValue = 0d;
+    private Double sameTotleValue = 0d;
     //环比平均值
     @Excel(name = "去年平均住院天数（天）", width = 15, orderNum = "3")
     private Double lastAverageValue = 0d;
@@ -26,4 +28,4 @@ public class AverageStatisticsDTO {
     private Double lastYearAverageValue = 0d;
     //科室分类
     private String deptClass;
-}
+}

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/BehospitalInfoDTO.java

@@ -95,12 +95,12 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 最后得分
      */
-    private String scoreRes;
+    private Double scoreRes;
 
     /**
      * 病案首页得分
      */
-    private String scoreBn;
+    private Double scoreBn;
 
     /**
      * 评分类型(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/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/ExportExcelBehospitalDTO.java

@@ -27,9 +27,9 @@ public class ExportExcelBehospitalDTO {
     @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
     private Date leaveHospitalDate;
     @Excel(name = "分数", needMerge = true)
-    private String score;
+    private Double score;
     @Excel(name = "病案首页分数", needMerge = true)
-    private String scoreBn;
+    private Double scoreBn;
     @ExcelCollection(name = "")
     private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
 

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/ExportExcelDTO.java

@@ -18,7 +18,7 @@ public class ExportExcelDTO {
     @Excel(name = "科室", needMerge = true)
     private String behDeptName;
     @Excel(name = "平均分数", needMerge = true)
-    private String avgScore;
+    private Double avgScore;
     @ExcelCollection(name = "")
     private List<ExportExcelBehospitalDTO> excelBehospitalDTOS;
 

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
@@ -42,7 +42,7 @@ public class HomePageNumDTO {
     /**
      * 质控病历数
      */
-    @Excel(name = "质控病历数", orderNum = "10")
+    @Excel(name = "质控病历数", orderNum = "11")
     private Integer mrNum = 0;
     /**
      * 质控评分（总分）
@@ -51,11 +51,12 @@ public class HomePageNumDTO {
     /**
      * 质控评分（平均分）
      */
-    @Excel(name = "质控平均分", orderNum = "9")
+    @Excel(name = "质控平均分", orderNum = "10")
     private Double averageValue = 0d;
     /**
      * 病案首页合格病历数
      */
+    @Excel(name = "合格数", orderNum = "4")
     private Integer firstLevelNum = 0;
     /**
      * 病案首页合格病历占比
@@ -68,7 +69,7 @@ public class HomePageNumDTO {
     /**
      * 病案首页合格病历占比（百分比）
      */
-    @Excel(name = "合格率", orderNum = "4")
+    @Excel(name = "合格率", orderNum = "5")
     private String firstLevelPercentStr = "0.00%";
     /**
      * 病案首页不合格病历占比（百分比）
@@ -85,12 +86,12 @@ public class HomePageNumDTO {
     /**
      * 空项数
      */
-    @Excel(name = "空项数", orderNum = "5")
+    @Excel(name = "空项数", orderNum = "6")
     private Integer emptyNum = 0;
     /**
      * 错误数
      */
-    @Excel(name = "错误数", orderNum = "7")
+    @Excel(name = "错误数", orderNum = "8")
     private Integer errorNum = 0;
     /**
      * 完整率、完善率分母（质控病历数*病案首页条目数）
@@ -107,11 +108,11 @@ public class HomePageNumDTO {
     /**
      * 完整率（百分比）
      */
-    @Excel(name = "完整率", orderNum = "6")
+    @Excel(name = "完整率", orderNum = "7")
     private String emptyPercentStr = "0.00%";
     /**
      * 完善率（百分比）
      */
-    @Excel(name = "完善率", orderNum = "8")
+    @Excel(name = "完善率", orderNum = "9")
     private String errorPercentStr = "0.00%";
 }

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
@@ -33,62 +33,256 @@ public class LevelStatisticsDTO {
     /**
      * 缺陷条目数
      */
+    private Integer entryNum = 0;
+
+    /**
+     * 缺陷条目数-带升降标示
+     */
     @Excel(name = "缺陷总数", orderNum = "3")
-    private Integer entryNum;
+    private String entryStrNum = "0";
+
+    /**
+     * 同比总数
+     */
+    private Integer sameNum = 0;
+
+    /**
+     * 同比总数-带升降标示
+     */
+    @Excel(name = "同比总数", orderNum = "4")
+    private String sameStrNum = "0";
+
+    /**
+     * 缺陷条目数现有数据与同期数据对比(-1-降 0-持平 1-升)
+     */
+    private Integer entrySameNum = 0;
+
     /**
      * 质控病历数
      */
-    @Excel(name = "质控病历数", orderNum = "5")
-    private Integer mrNum;
+    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;
+    private Double totleValue = 0d;
+
+    /**
+     * 同比质控评分（总分）
+     */
+    private Double sameTotleValue= 0d;
+
+
     /**
      * 质控评分（平均分）
      */
-    @Excel(name = "质控平均分", orderNum = "4")
-    private Double averageValue;
+    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;
+
     /**
      * 甲级病历数/病案首页合格病历数
      */
-    @Excel(name = "甲级病历数", orderNum = "6")
-    private Integer firstLevelNum;
+    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;
+
     /**
      * 乙级病历数/病案首页不合格病历数
      */
-    @Excel(name = "乙级病历数", orderNum = "7")
-    private Integer secondLevelNum;
+    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;
+
     /**
      * 丙级病历数
      */
-    @Excel(name = "丙级病历数", orderNum = "8")
-    private Integer thirdLevelNum;
+    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;
+    private Double firstLevelPercent = 0d;
+
+    /**
+     * 同比甲级病历占比/病案首页合格病历占比
+     */
+    private Double sameFirstLevelPercent = 0d;
+
+    /**
+     * 甲级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
+     */
+    private Integer firSameLevelPercent = 0;
+
     /**
      * 乙级病历占比/病案首页不合格病历占比
      */
-    private Double secondLevelPercent;
+    private Double secondLevelPercent= 0d;
+
+    /**
+     * 同比乙级病历占比/病案首页不合格病历占比
+     */
+    private Double sameSecondLevelPercent = 0d;
+
+    /**
+     * 乙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
+     */
+    private Integer secSameLevelPercent = 0;
+
     /**
      * 丙级病历占比
      */
-    private Double thirdLevelPercent;
+    private Double thirdLevelPercent= 0d;
+
+    /**
+     * 同比丙级病历占比
+     */
+    private Double sameThirdLevelPercent = 0d;
+
+    /**
+     * 丙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
+     */
+    private Integer thiSameLevelPercent = 0;
+
     /**
      * 甲级病历占比（百分比）/病案首页合格病历占比（百分比）
      */
-    @Excel(name = "甲级率", orderNum = "9")
-    private String firstLevelPercentStr;
+    @Excel(name = "甲级率", orderNum = "15")
+    private String firstLevelPercentStr = "0.00%";
+
+    /**
+     * 同比甲级病历占比（百分比）/病案首页合格病历占比（百分比）
+     */
+    @Excel(name = "同比甲级率", orderNum = "16")
+    private String sameFirstLevelPercentStr = "0.00%";
+
     /**
      * 乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
      */
-    @Excel(name = "乙级率", orderNum = "10")
-    private String secondLevelPercentStr;
+    @Excel(name = "乙级率", orderNum = "17")
+    private String secondLevelPercentStr = "0.00%";
+
+    /**
+     * 同比乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
+     */
+    @Excel(name = "同比乙级率", orderNum = "18")
+    private String sameSecondLevelPercentStr = "0.00%";
+
     /**
      * 丙级病历占比（百分比）
      */
-    @Excel(name = "丙级率", orderNum = "11")
-    private String thirdLevelPercentStr;
+    @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/MedicalCheckDTO.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 @Getter
 @Setter
-public class MedicalCheckDTO extends Object {
+public class MedicalCheckDTO{
 
     //科室名称
     private String deptName;
@@ -27,63 +27,184 @@ public class MedicalCheckDTO extends Object {
     //医生
     private String doctorName;
 
-    //入院记录未24小时内
-    private Integer ryjlw_24 = 0;
+    //入院记录未24小时内_id
+    private String entry_2658_id;
 
-    //首次病程记录未8小时内
-    private Integer scbcjlw_8h = 0;
+    //入院记录未24小时内_name
+    private String entry_2658_name;
 
-    //副主任/主任医师首次查房72小时内未完成
-    private Integer zrsccfw_72h = 0;
+    //入院记录未24小时内_num
+    private Integer entry_2658_num = 0;
 
-    //入院后未连记3天病程
-    private Integer ryhljbcw_3d = 0;
+    //首次病程记录未8小时内_id
+    private String entry_2686_id;
 
-    //每周未至少2次副主任/主任医师查房
-    private Integer zrcfw_2w = 0;
+    //首次病程记录未8小时内_name
+    private String entry_2686_name;
 
-    //每周未至少3次主治医师查房记录
-    private Integer zzcfw_3w = 0;
+    //首次病程记录未8小时内_num
+    private Integer entry_2686_num = 0;
 
-    //抢救记录未6小时内完成
-    private Integer qjjlw_6h = 0;
+    //副主任/主任医师首次查房72小时内未完成_id
+    private String entry_2657_id;
 
-    //会诊记录在会诊申请后未24小时完成
-    private Integer hzjlw_24h = 0;
+    //副主任/主任医师首次查房72小时内未完成_name
+    private String entry_2657_name;
 
-    //术前讨论、术前小结未完成
-    private Integer sqtlxjw = 0;
+    //副主任/主任医师首次查房72小时内未完成_num
+    private Integer entry_2657_num = 0;
 
-    //手术记录术后24小时内未完成
-    private Integer sxjlsw_24h = 0;
+    //入院后未连记3天病程_id
+    private String entry_3010_id;
 
-    //术后首程在术后30分钟内未完成
-    private Integer xhscw_30m = 0;
+    //入院后未连记3天病程_name
+    private String entry_3010_name;
 
-    //术后主刀查房24小时内未完成
-    private Integer shzdcfw_24h = 0;
+    //入院后未连记3天病程_num
+    private Integer entry_3010_num = 0;
 
-    //术后未连记3天病程
-    private Integer shjbcw_3d = 0;
+    //每周未至少2次副主任/主任医师查房_id
+    private String entry_2655_id;
 
-    //转科后未连记3天病程
-    private Integer zkjbcw_3d = 0;
+    //每周未至少2次副主任/主任医师查房_name
+    private String entry_2655_name;
 
-    //转接科记录专科后24小时内未完成
-    private Integer zkjlw_24 = 0;
+    //每周未至少2次副主任/主任医师查房_num
+    private Integer entry_2655_num = 0;
 
-    //病危/重患者未每日记录病程
-    private Integer bwzhjlbcw_md = 0;
+    //每周未至少3次主治医师查房记录_id
+    private String entry_2654_id;
 
-    //输血后未完成输血记录
-    private Integer sxhwjl = 0;
+    //每周未至少3次主治医师查房记录_name
+    private String entry_2654_name;
 
-    //24小时未完成输血后评价
-    private Integer sxpjw_24 = 0;
+    //每周未至少3次主治医师查房记录_num
+    private Integer entry_2654_num = 0;
 
-    //危急值未记录
-    private Integer wjzwjl = 0;
+    //抢救记录未6小时内完成_id
+    private String entry_2852_id;
 
-    //住院30天未阶段小结
-    private Integer wywwcxj = 0;
+    //抢救记录未6小时内完成_name
+    private String entry_2852_name;
+
+    //抢救记录未6小时内完成-num
+    private Integer entry_2852_num = 0;
+
+    //会诊记录在会诊申请后未24小时完成_id
+    private String entry_2287_id;
+
+    //会诊记录在会诊申请后未24小时完成_name
+    private String entry_2287_name;
+
+    //会诊记录在会诊申请后未24小时完成_num
+    private Integer entry_2287_num = 0;
+
+    //术前讨论、术前小结未完成_id
+    private String entry_3025_id;
+
+    //术前讨论、术前小结未完成_name
+    private String entry_3025_name;
+
+    //术前讨论、术前小结未完成_num
+    private Integer entry_3025_num = 0;
+
+    //手术记录术后24小时内未完成_id
+    private String entry_2170_id;
+
+    //手术记录术后24小时内未完成_name
+    private String entry_2170_name;
+
+    //手术记录术后24小时内未完成_num
+    private Integer entry_2170_num = 0;
+
+    //术后首程在术后30分钟内未完成_id
+    private String entry_2930_id;
+
+    //术后首程在术后30分钟内未完成_name
+    private String entry_2930_name;
+
+    //术后首程在术后30分钟内未完成_num
+    private Integer entry_2930_num = 0;
+
+    //术后主刀查房24小时内未完成_id
+    private String entry_2900_id;
+
+    //术后主刀查房24小时内未完成_name
+    private String entry_2900_name;
+
+    //术后主刀查房24小时内未完成_num
+    private Integer entry_2900_num = 0;
+
+    //术后未连记3天病程_id
+    private String entry_2229_id;
+
+    //术后未连记3天病程_name
+    private String entry_2229_name;
+
+    //术后未连记3天病程_num
+    private Integer entry_2229_num = 0;
+
+    //转科后未连记3天病程_id
+    private String entry_2217_id;
+
+    //转科后未连记3天病程_name
+    private String entry_2217_name;
+
+    //转科后未连记3天病程_num
+    private Integer entry_2217_num = 0;
+
+    //转接科记录专科后24小时内未完成_id
+    private String entry_2218_id;
+
+    //转接科记录专科后24小时内未完成_name
+    private String entry_2218_name;
+
+    //转接科记录专科后24小时内未完成_num
+    private Integer entry_2218_num = 0;
+
+    //病危/重患者未每日记录病程_id
+    private String entry_2220_id;
+
+    //病危/重患者未每日记录病程_name
+    private String entry_2220_name;
+
+    //病危/重患者未每日记录病程_num
+    private Integer entry_2220_num = 0;
+
+    //输血后未完成输血记录_id
+    private String entry_2486_id;
+
+    //输血后未完成输血记录_name
+    private String entry_2486_name;
+
+    //输血后未完成输血记录_num
+    private Integer entry_2486_num = 0;
+
+    //24小时未完成输血后评价_id
+    private String entry_3063_id;
+
+    //24小时未完成输血后评价_name
+    private String entry_3063_name;
+
+    //24小时未完成输血后评价_num
+    private Integer entry_3063_num = 0;
+
+    //危急值未记录_id
+    private String entry_3062_id;
+
+    //危急值未记录_name
+    private String entry_3062_name;
+
+    //危急值未记录_num
+    private Integer entry_3062_num = 0;
+
+    //住院30天未阶段小结_id
+    private String entry_2495_id;
+
+    //住院30天未阶段小结_name
+    private String entry_2495_name;
+
+    //住院30天未阶段小结_num
+    private Integer entry_2495_num = 0;
 }
+

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

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

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/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/MedAbnormalInfo.java

@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author gaodm
@@ -29,6 +29,11 @@ public class MedAbnormalInfo implements Serializable {
      */
     private String moduleName;
 
+    /**
+     * 文书id
+     */
+    private String recId;
+
     /**
      * 入参
      */
@@ -76,6 +81,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setAbnormalId(Long abnormalId) {
         this.abnormalId = abnormalId;
     }
+
     public String getModuleName() {
         return moduleName;
     }
@@ -83,6 +89,15 @@ public class MedAbnormalInfo implements Serializable {
     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;
     }
@@ -90,6 +105,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setParamIn(String paramIn) {
         this.paramIn = paramIn;
     }
+
     public String getParamOut() {
         return paramOut;
     }
@@ -97,6 +113,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setParamOut(String paramOut) {
         this.paramOut = paramOut;
     }
+
     public String getRamark() {
         return ramark;
     }
@@ -104,6 +121,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setRamark(String ramark) {
         this.ramark = ramark;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -111,6 +129,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -118,6 +137,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -125,6 +145,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -132,6 +153,7 @@ public class MedAbnormalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -143,16 +165,17 @@ public class MedAbnormalInfo implements Serializable {
     @Override
     public String toString() {
         return "MedAbnormalInfo{" +
-            "abnormalId=" + abnormalId +
+                "abnormalId=" + abnormalId +
                 ", moduleName=" + moduleName +
-            ", paramIn=" + paramIn +
-            ", paramOut=" + paramOut +
-            ", ramark=" + ramark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
+                ", 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,19 +1,16 @@
 package com.diagbot.entity;
 
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- *
+ * 
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-08-04
  */
-@Data
 public class MedLisResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -48,7 +45,11 @@ public class MedLisResult implements Serializable {
      */
     private String result;
 
+    /**
+     * 参考值
+     */
     private String reference;
+
     /**
      * 最小参考值
      */
@@ -98,4 +99,147 @@ public class MedLisResult implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    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 getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = 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 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 "MedLisResult{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", itemCode=" + itemCode +
+            ", itemName=" + itemName +
+            ", result=" + result +
+            ", reference=" + reference +
+            ", referenceMin=" + referenceMin +
+            ", referenceMax=" + referenceMax +
+            ", unit=" + unit +
+            ", abnormal=" + abnormal +
+            ", color=" + color +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
 }

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

@@ -1,7 +1,5 @@
 package com.diagbot.entity;
 
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-08-04
  */
-@Data
 public class MedPacsResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -107,4 +104,155 @@ public class MedPacsResult implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    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 getReptName() {
+        return reptName;
+    }
+
+    public void setReptName(String reptName) {
+        this.reptName = reptName;
+    }
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+    public String getClinicSight() {
+        return clinicSight;
+    }
+
+    public void setClinicSight(String clinicSight) {
+        this.clinicSight = clinicSight;
+    }
+    public String getReptDiag() {
+        return reptDiag;
+    }
+
+    public void setReptDiag(String reptDiag) {
+        this.reptDiag = reptDiag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getClinicDiag() {
+        return clinicDiag;
+    }
+
+    public void setClinicDiag(String clinicDiag) {
+        this.clinicDiag = clinicDiag;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getCheckerDoctor() {
+        return checkerDoctor;
+    }
+
+    public void setCheckerDoctor(String checkerDoctor) {
+        this.checkerDoctor = checkerDoctor;
+    }
+    public String getReportDoctor() {
+        return reportDoctor;
+    }
+
+    public void setReportDoctor(String reportDoctor) {
+        this.reportDoctor = reportDoctor;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    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 "MedPacsResult{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", reptName=" + reptName +
+            ", part=" + part +
+            ", clinicSight=" + clinicSight +
+            ", reptDiag=" + reptDiag +
+            ", remark=" + remark +
+            ", clinicDiag=" + clinicDiag +
+            ", applyDoctor=" + applyDoctor +
+            ", checkerDoctor=" + checkerDoctor +
+            ", reportDoctor=" + reportDoctor +
+            ", deptName=" + deptName +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
 }

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

@@ -39,6 +39,11 @@ public class QcType implements Serializable {
      */
     private String name;
 
+    /**
+     * 默认模版是否开启(0-否 1-是)
+     */
+    private Long defaultModule;
+
     /**
      * 备注
      */
@@ -148,12 +153,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/StrAdmissionNote.java

@@ -0,0 +1,804 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 入院记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrAdmissionNote 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 birthday;
+
+    /**
+     * 婚姻状况
+     */
+    private String marriage;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 工作单位
+     */
+    private String workplace;
+
+    /**
+     * 户口地址
+     */
+    private String registerAddress;
+
+    /**
+     * 出生地
+     */
+    private String bornAddress;
+
+    /**
+     * 预产期
+     */
+    private String expectDate;
+
+    /**
+     * 末次月经
+     */
+    private String lastMenstrual;
+
+    /**
+     * 孕/产次
+     */
+    private String pregnantNum;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 病史陈述者
+     */
+    private String historyTeller;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 个人史
+     */
+    private String personalHistory;
+
+    /**
+     * 婚育史
+     */
+    private String maritalHistory;
+
+    /**
+     * 月经史
+     */
+    private String menstrualHistory;
+
+    /**
+     * 家族史
+     */
+    private String familyHistory;
+
+    /**
+     * 喂养史
+     */
+    private String feedingHistory;
+
+    /**
+     * 手术外伤史
+     */
+    private String operationHistory;
+
+    /**
+     * 输血史
+     */
+    private String bloodHistory;
+
+    /**
+     * 传染病史
+     */
+    private String infectionHistory;
+
+    /**
+     * 专科检查
+     */
+    private String specialVital;
+
+    /**
+     * 辅助检查
+     */
+    private String assistantExam;
+
+    /**
+     * 实验室检查
+     */
+    private String lisExam;
+
+    /**
+     * 影像学检查
+     */
+    private String pacsExam;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 补充诊断
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 修正诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 体温
+     */
+    private String temperature;
+
+    /**
+     * 脉搏
+     */
+    private String pulse;
+
+    /**
+     * 呼吸
+     */
+    private String breathe;
+
+    /**
+     * 血压
+     */
+    private String bloodPressure;
+
+    /**
+     * 疼痛
+     */
+    private String pain;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * BMI
+     */
+    private String bmi;
+
+    /**
+     * 结构化数据
+     */
+    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 getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+    public String getMarriage() {
+        return marriage;
+    }
+
+    public void setMarriage(String marriage) {
+        this.marriage = marriage;
+    }
+    public String getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(String jobType) {
+        this.jobType = jobType;
+    }
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+    public String getWorkplace() {
+        return workplace;
+    }
+
+    public void setWorkplace(String workplace) {
+        this.workplace = workplace;
+    }
+    public String getRegisterAddress() {
+        return registerAddress;
+    }
+
+    public void setRegisterAddress(String registerAddress) {
+        this.registerAddress = registerAddress;
+    }
+    public String getBornAddress() {
+        return bornAddress;
+    }
+
+    public void setBornAddress(String bornAddress) {
+        this.bornAddress = bornAddress;
+    }
+    public String getExpectDate() {
+        return expectDate;
+    }
+
+    public void setExpectDate(String expectDate) {
+        this.expectDate = expectDate;
+    }
+    public String getLastMenstrual() {
+        return lastMenstrual;
+    }
+
+    public void setLastMenstrual(String lastMenstrual) {
+        this.lastMenstrual = lastMenstrual;
+    }
+    public String getPregnantNum() {
+        return pregnantNum;
+    }
+
+    public void setPregnantNum(String pregnantNum) {
+        this.pregnantNum = pregnantNum;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getHistoryTeller() {
+        return historyTeller;
+    }
+
+    public void setHistoryTeller(String historyTeller) {
+        this.historyTeller = historyTeller;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getPresent() {
+        return present;
+    }
+
+    public void setPresent(String present) {
+        this.present = present;
+    }
+    public String getPastHistory() {
+        return pastHistory;
+    }
+
+    public void setPastHistory(String pastHistory) {
+        this.pastHistory = pastHistory;
+    }
+    public String getPersonalHistory() {
+        return personalHistory;
+    }
+
+    public void setPersonalHistory(String personalHistory) {
+        this.personalHistory = personalHistory;
+    }
+    public String getMaritalHistory() {
+        return maritalHistory;
+    }
+
+    public void setMaritalHistory(String maritalHistory) {
+        this.maritalHistory = maritalHistory;
+    }
+    public String getMenstrualHistory() {
+        return menstrualHistory;
+    }
+
+    public void setMenstrualHistory(String menstrualHistory) {
+        this.menstrualHistory = menstrualHistory;
+    }
+    public String getFamilyHistory() {
+        return familyHistory;
+    }
+
+    public void setFamilyHistory(String familyHistory) {
+        this.familyHistory = familyHistory;
+    }
+    public String getFeedingHistory() {
+        return feedingHistory;
+    }
+
+    public void setFeedingHistory(String feedingHistory) {
+        this.feedingHistory = feedingHistory;
+    }
+    public String getOperationHistory() {
+        return operationHistory;
+    }
+
+    public void setOperationHistory(String operationHistory) {
+        this.operationHistory = operationHistory;
+    }
+    public String getBloodHistory() {
+        return bloodHistory;
+    }
+
+    public void setBloodHistory(String bloodHistory) {
+        this.bloodHistory = bloodHistory;
+    }
+    public String getInfectionHistory() {
+        return infectionHistory;
+    }
+
+    public void setInfectionHistory(String infectionHistory) {
+        this.infectionHistory = infectionHistory;
+    }
+    public String getSpecialVital() {
+        return specialVital;
+    }
+
+    public void setSpecialVital(String specialVital) {
+        this.specialVital = specialVital;
+    }
+    public String getAssistantExam() {
+        return assistantExam;
+    }
+
+    public void setAssistantExam(String assistantExam) {
+        this.assistantExam = assistantExam;
+    }
+    public String getLisExam() {
+        return lisExam;
+    }
+
+    public void setLisExam(String lisExam) {
+        this.lisExam = lisExam;
+    }
+    public String getPacsExam() {
+        return pacsExam;
+    }
+
+    public void setPacsExam(String pacsExam) {
+        this.pacsExam = pacsExam;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getSupplyDiagnosis() {
+        return supplyDiagnosis;
+    }
+
+    public void setSupplyDiagnosis(String supplyDiagnosis) {
+        this.supplyDiagnosis = supplyDiagnosis;
+    }
+    public String getRevisedDiagnosis() {
+        return revisedDiagnosis;
+    }
+
+    public void setRevisedDiagnosis(String revisedDiagnosis) {
+        this.revisedDiagnosis = revisedDiagnosis;
+    }
+    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 getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+    public String getPulse() {
+        return pulse;
+    }
+
+    public void setPulse(String pulse) {
+        this.pulse = pulse;
+    }
+    public String getBreathe() {
+        return breathe;
+    }
+
+    public void setBreathe(String breathe) {
+        this.breathe = breathe;
+    }
+    public String getBloodPressure() {
+        return bloodPressure;
+    }
+
+    public void setBloodPressure(String bloodPressure) {
+        this.bloodPressure = bloodPressure;
+    }
+    public String getPain() {
+        return pain;
+    }
+
+    public void setPain(String pain) {
+        this.pain = pain;
+    }
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+    public String getBmi() {
+        return bmi;
+    }
+
+    public void setBmi(String bmi) {
+        this.bmi = bmi;
+    }
+    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 "StrAdmissionNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", birthday=" + birthday +
+            ", marriage=" + marriage +
+            ", jobType=" + jobType +
+            ", nation=" + nation +
+            ", phone=" + phone +
+            ", workplace=" + workplace +
+            ", registerAddress=" + registerAddress +
+            ", bornAddress=" + bornAddress +
+            ", expectDate=" + expectDate +
+            ", lastMenstrual=" + lastMenstrual +
+            ", pregnantNum=" + pregnantNum +
+            ", behospitalDate=" + behospitalDate +
+            ", historyTeller=" + historyTeller +
+            ", chief=" + chief +
+            ", present=" + present +
+            ", pastHistory=" + pastHistory +
+            ", personalHistory=" + personalHistory +
+            ", maritalHistory=" + maritalHistory +
+            ", menstrualHistory=" + menstrualHistory +
+            ", familyHistory=" + familyHistory +
+            ", feedingHistory=" + feedingHistory +
+            ", operationHistory=" + operationHistory +
+            ", bloodHistory=" + bloodHistory +
+            ", infectionHistory=" + infectionHistory +
+            ", specialVital=" + specialVital +
+            ", assistantExam=" + assistantExam +
+            ", lisExam=" + lisExam +
+            ", pacsExam=" + pacsExam +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", supplyDiagnosis=" + supplyDiagnosis +
+            ", revisedDiagnosis=" + revisedDiagnosis +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", temperature=" + temperature +
+            ", pulse=" + pulse +
+            ", breathe=" + breathe +
+            ", bloodPressure=" + bloodPressure +
+            ", pain=" + pain +
+            ", weight=" + weight +
+            ", height=" + height +
+            ", bmi=" + bmi +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,310 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血效果评价
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrBloodResult 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 transfusionEvaluate;
+
+    /**
+     * 记录医生
+     */
+    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 getTransfusionEvaluate() {
+        return transfusionEvaluate;
+    }
+
+    public void setTransfusionEvaluate(String transfusionEvaluate) {
+        this.transfusionEvaluate = transfusionEvaluate;
+    }
+    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 "StrBloodResult{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transfusionEvaluate=" + transfusionEvaluate +
+            ", 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/StrBloodTransfusion.java

@@ -0,0 +1,362 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrBloodTransfusion 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 startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 输血原因
+     */
+    private String transfusionReason;
+
+    /**
+     * 输注种类、血型、数量
+     */
+    private String transfusionType;
+
+    /**
+     * 输注过程
+     */
+    private String transfusionProcess;
+
+    /**
+     * 记录医生
+     */
+    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 getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getTransfusionReason() {
+        return transfusionReason;
+    }
+
+    public void setTransfusionReason(String transfusionReason) {
+        this.transfusionReason = transfusionReason;
+    }
+    public String getTransfusionType() {
+        return transfusionType;
+    }
+
+    public void setTransfusionType(String transfusionType) {
+        this.transfusionType = transfusionType;
+    }
+    public String getTransfusionProcess() {
+        return transfusionProcess;
+    }
+
+    public void setTransfusionProcess(String transfusionProcess) {
+        this.transfusionProcess = transfusionProcess;
+    }
+    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 "StrBloodTransfusion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", transfusionReason=" + transfusionReason +
+            ", transfusionType=" + transfusionType +
+            ", transfusionProcess=" + transfusionProcess +
+            ", 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/StrConsultationApply.java

@@ -0,0 +1,466 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊申请单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrConsultationApply 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 Date behospitalDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    private String diagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    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 Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    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;
+    }
+
+    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 getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+    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 "StrConsultationApply{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", behospitalDate=" + behospitalDate +
+            ", recTitle=" + recTitle +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", diagnosis=" + diagnosis +
+            ", 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/StrConsultationNote.java

@@ -0,0 +1,466 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊单（申请和结果）
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrConsultationNote 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 "StrConsultationNote{" +
+            "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/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/StrConsultationResult.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 StrConsultationResult 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 currentDiagnosis;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 会诊到达时间
+     */
+    private Date consultationArriveDate;
+
+    /**
+     * 记录医生
+     */
+    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 getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    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 Date getConsultationArriveDate() {
+        return consultationArriveDate;
+    }
+
+    public void setConsultationArriveDate(Date consultationArriveDate) {
+        this.consultationArriveDate = consultationArriveDate;
+    }
+    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 "StrConsultationResult{" +
+            "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 +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", consultationArriveDate=" + consultationArriveDate +
+            ", 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/StrCrisisNote.java

@@ -0,0 +1,336 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 危急值记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrCrisisNote 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 crisisNote;
+
+    /**
+     * 病情分析及处理
+     */
+    private String briefNote;
+
+    /**
+     * 接收时间
+     */
+    private Date recieveDate;
+
+    /**
+     * 记录医生
+     */
+    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 getCrisisNote() {
+        return crisisNote;
+    }
+
+    public void setCrisisNote(String crisisNote) {
+        this.crisisNote = crisisNote;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public Date getRecieveDate() {
+        return recieveDate;
+    }
+
+    public void setRecieveDate(Date recieveDate) {
+        this.recieveDate = recieveDate;
+    }
+    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 "StrCrisisNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", crisisNote=" + crisisNote +
+            ", briefNote=" + briefNote +
+            ", recieveDate=" + recieveDate +
+            ", 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/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/StrDeathNote.java

@@ -0,0 +1,388 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDeathNote 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 Date deathDate;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 死亡原因
+     */
+    private String deathReason;
+
+    /**
+     * 死亡诊断
+     */
+    private String deathDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    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 Date getDeathDate() {
+        return deathDate;
+    }
+
+    public void setDeathDate(Date deathDate) {
+        this.deathDate = deathDate;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getDeathReason() {
+        return deathReason;
+    }
+
+    public void setDeathReason(String deathReason) {
+        this.deathReason = deathReason;
+    }
+    public String getDeathDiagnosis() {
+        return deathDiagnosis;
+    }
+
+    public void setDeathDiagnosis(String deathDiagnosis) {
+        this.deathDiagnosis = deathDiagnosis;
+    }
+    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 "StrDeathNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", deathDate=" + deathDate +
+            ", behospitalSituation=" + behospitalSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", deathReason=" + deathReason +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", 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/StrDifficultCase.java

@@ -0,0 +1,401 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 疑难病例讨论记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDifficultCase 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 discussDate;
+
+    /**
+     * 讨论地点
+     */
+    private String discussPlace;
+
+    /**
+     * 主持人姓名及专业技术职务
+     */
+    private String anchorMan;
+
+    /**
+     * 参加人员的姓名及专业技术职务
+     */
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    private String briefHistory;
+
+    /**
+     * 讨论目的
+     */
+    private String discussAim;
+
+    /**
+     * 具体讨论意见
+     */
+    private String discussionOpinions;
+
+    /**
+     * 主持人小结
+     */
+    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 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 getAnchorMan() {
+        return anchorMan;
+    }
+
+    public void setAnchorMan(String anchorMan) {
+        this.anchorMan = anchorMan;
+    }
+    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 getDiscussAim() {
+        return discussAim;
+    }
+
+    public void setDiscussAim(String discussAim) {
+        this.discussAim = discussAim;
+    }
+    public String getDiscussionOpinions() {
+        return discussionOpinions;
+    }
+
+    public void setDiscussionOpinions(String discussionOpinions) {
+        this.discussionOpinions = discussionOpinions;
+    }
+    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 "StrDifficultCase{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchorMan=" + anchorMan +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussAim=" + discussAim +
+            ", discussionOpinions=" + discussionOpinions +
+            ", 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/StrFirstRecord.java

@@ -0,0 +1,427 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 首次病程录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrFirstRecord 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 chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 查体
+     */
+    private String vital;
+
+    /**
+     * 辅检
+     */
+    private String assistantExam;
+
+    /**
+     * 病例特点
+     */
+    private String caseCharacter;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊断依据
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 鉴别诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 诊疗计划(方案)
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    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 getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getPresent() {
+        return present;
+    }
+
+    public void setPresent(String present) {
+        this.present = present;
+    }
+    public String getPastHistory() {
+        return pastHistory;
+    }
+
+    public void setPastHistory(String pastHistory) {
+        this.pastHistory = pastHistory;
+    }
+    public String getVital() {
+        return vital;
+    }
+
+    public void setVital(String vital) {
+        this.vital = vital;
+    }
+    public String getAssistantExam() {
+        return assistantExam;
+    }
+
+    public void setAssistantExam(String assistantExam) {
+        this.assistantExam = assistantExam;
+    }
+    public String getCaseCharacter() {
+        return caseCharacter;
+    }
+
+    public void setCaseCharacter(String caseCharacter) {
+        this.caseCharacter = caseCharacter;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getSupplyDiagnosis() {
+        return supplyDiagnosis;
+    }
+
+    public void setSupplyDiagnosis(String supplyDiagnosis) {
+        this.supplyDiagnosis = supplyDiagnosis;
+    }
+    public String getRevisedDiagnosis() {
+        return revisedDiagnosis;
+    }
+
+    public void setRevisedDiagnosis(String revisedDiagnosis) {
+        this.revisedDiagnosis = revisedDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    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 "StrFirstRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", chief=" + chief +
+            ", present=" + present +
+            ", pastHistory=" + pastHistory +
+            ", vital=" + vital +
+            ", assistantExam=" + assistantExam +
+            ", caseCharacter=" + caseCharacter +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", supplyDiagnosis=" + supplyDiagnosis +
+            ", revisedDiagnosis=" + revisedDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", 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/StrIllCritically.java

@@ -0,0 +1,323 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病危通知单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrIllCritically 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 currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    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 getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getCriticalSituation() {
+        return criticalSituation;
+    }
+
+    public void setCriticalSituation(String criticalSituation) {
+        this.criticalSituation = criticalSituation;
+    }
+    public String getPatientSign() {
+        return patientSign;
+    }
+
+    public void setPatientSign(String patientSign) {
+        this.patientSign = patientSign;
+    }
+    public Date getPatientSignDate() {
+        return patientSignDate;
+    }
+
+    public void setPatientSignDate(Date patientSignDate) {
+        this.patientSignDate = patientSignDate;
+    }
+    public String getDoctorSign() {
+        return doctorSign;
+    }
+
+    public void setDoctorSign(String doctorSign) {
+        this.doctorSign = doctorSign;
+    }
+    public Date getDoctorSignDate() {
+        return doctorSignDate;
+    }
+
+    public void setDoctorSignDate(Date doctorSignDate) {
+        this.doctorSignDate = doctorSignDate;
+    }
+    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 "StrIllCritically{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", criticalSituation=" + criticalSituation +
+            ", patientSign=" + patientSign +
+            ", patientSignDate=" + patientSignDate +
+            ", doctorSign=" + doctorSign +
+            ", doctorSignDate=" + doctorSignDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,323 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病重通知单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrIllSeriousl 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 currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    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 getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getCriticalSituation() {
+        return criticalSituation;
+    }
+
+    public void setCriticalSituation(String criticalSituation) {
+        this.criticalSituation = criticalSituation;
+    }
+    public String getPatientSign() {
+        return patientSign;
+    }
+
+    public void setPatientSign(String patientSign) {
+        this.patientSign = patientSign;
+    }
+    public Date getPatientSignDate() {
+        return patientSignDate;
+    }
+
+    public void setPatientSignDate(Date patientSignDate) {
+        this.patientSignDate = patientSignDate;
+    }
+    public String getDoctorSign() {
+        return doctorSign;
+    }
+
+    public void setDoctorSign(String doctorSign) {
+        this.doctorSign = doctorSign;
+    }
+    public Date getDoctorSignDate() {
+        return doctorSignDate;
+    }
+
+    public void setDoctorSignDate(Date doctorSignDate) {
+        this.doctorSignDate = doctorSignDate;
+    }
+    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 "StrIllSeriousl{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", criticalSituation=" + criticalSituation +
+            ", patientSign=" + patientSign +
+            ", patientSignDate=" + patientSignDate +
+            ", doctorSign=" + doctorSign +
+            ", doctorSignDate=" + doctorSignDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,427 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 出院小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrLeaveHospital 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 Date leaveHospitalDate;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 出院诊断
+     */
+    private String leaveDiagnosis;
+
+    /**
+     * 住院天数
+     */
+    private String behospitalDayNum;
+
+    /**
+     * 入院原因
+     */
+    private String behospitalReason;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 诊治经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 出院情况
+     */
+    private String leaveHospitalSituation;
+
+    /**
+     * 出院医嘱
+     */
+    private String leaveHospitalDoctoradvice;
+
+    /**
+     * 记录医生
+     */
+    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 Date getLeaveHospitalDate() {
+        return leaveHospitalDate;
+    }
+
+    public void setLeaveHospitalDate(Date leaveHospitalDate) {
+        this.leaveHospitalDate = leaveHospitalDate;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getLeaveDiagnosis() {
+        return leaveDiagnosis;
+    }
+
+    public void setLeaveDiagnosis(String leaveDiagnosis) {
+        this.leaveDiagnosis = leaveDiagnosis;
+    }
+    public String getBehospitalDayNum() {
+        return behospitalDayNum;
+    }
+
+    public void setBehospitalDayNum(String behospitalDayNum) {
+        this.behospitalDayNum = behospitalDayNum;
+    }
+    public String getBehospitalReason() {
+        return behospitalReason;
+    }
+
+    public void setBehospitalReason(String behospitalReason) {
+        this.behospitalReason = behospitalReason;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getLeaveHospitalSituation() {
+        return leaveHospitalSituation;
+    }
+
+    public void setLeaveHospitalSituation(String leaveHospitalSituation) {
+        this.leaveHospitalSituation = leaveHospitalSituation;
+    }
+    public String getLeaveHospitalDoctoradvice() {
+        return leaveHospitalDoctoradvice;
+    }
+
+    public void setLeaveHospitalDoctoradvice(String leaveHospitalDoctoradvice) {
+        this.leaveHospitalDoctoradvice = leaveHospitalDoctoradvice;
+    }
+    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 "StrLeaveHospital{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", leaveHospitalDate=" + leaveHospitalDate +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", leaveDiagnosis=" + leaveDiagnosis +
+            ", behospitalDayNum=" + behospitalDayNum +
+            ", behospitalReason=" + behospitalReason +
+            ", behospitalSituation=" + behospitalSituation +
+            ", treatmentProcess=" + treatmentProcess +
+            ", leaveHospitalSituation=" + leaveHospitalSituation +
+            ", leaveHospitalDoctoradvice=" + leaveHospitalDoctoradvice +
+            ", 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/StrOperativeFirstRecord.java

@@ -0,0 +1,531 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术后首程
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrOperativeFirstRecord 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 operationDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 麻醉方式
+     */
+    private String narcosisType;
+
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 术（中）后诊断
+     */
+    private String postoperativeDiagnosis;
+
+    /**
+     * 手术人员
+     */
+    private String operationMan;
+
+    /**
+     * 手术名称方式
+     */
+    private String operationName;
+
+    /**
+     * 手术简要经过
+     */
+    private String operationProcess;
+
+    /**
+     * 患者术后情况
+     */
+    private String postoperativeSituation;
+
+    /**
+     * 术后处理措施
+     */
+    private String postoperativeTreatment;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 术后可能出现的并发症及预防措施
+     */
+    private String postoperativeComplication;
+
+    /**
+     * 手术切除标本
+     */
+    private String operationSpecimen;
+
+    /**
+     * 术中出血量
+     */
+    private String operationBleed;
+
+    /**
+     * 术中输血量
+     */
+    private String operationBloodTransfusion;
+
+    /**
+     * 术中并发症
+     */
+    private String operationComplication;
+
+    /**
+     * 记录医生
+     */
+    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 getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getNarcosisType() {
+        return narcosisType;
+    }
+
+    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;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getPostoperativeDiagnosis() {
+        return postoperativeDiagnosis;
+    }
+
+    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;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getOperationProcess() {
+        return operationProcess;
+    }
+
+    public void setOperationProcess(String operationProcess) {
+        this.operationProcess = operationProcess;
+    }
+    public String getPostoperativeSituation() {
+        return postoperativeSituation;
+    }
+
+    public void setPostoperativeSituation(String postoperativeSituation) {
+        this.postoperativeSituation = postoperativeSituation;
+    }
+    public String getPostoperativeTreatment() {
+        return postoperativeTreatment;
+    }
+
+    public void setPostoperativeTreatment(String postoperativeTreatment) {
+        this.postoperativeTreatment = postoperativeTreatment;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    public String getPostoperativeComplication() {
+        return postoperativeComplication;
+    }
+
+    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;
+    }
+
+    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 "StrOperativeFirstRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", 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 +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,544 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrOperativeNote 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 operationDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术名称
+     */
+    private String operationName;
+
+    /**
+     * 术（中）后诊断
+     */
+    private String postoperativeDiagnosis;
+
+    /**
+     * 主刀医师
+     */
+    private String operationSurgeon;
+
+    /**
+     * 一助
+     */
+    private String firstHelping;
+
+    /**
+     * 二助
+     */
+    private String secondHelping;
+
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
+    /**
+     * 麻醉方式
+     */
+    private String narcosisType;
+
+    /**
+     * 切口类别
+     */
+    private String cutType;
+
+    /**
+     * 病理诊断
+     */
+    private String pathologicalDiagnosis;
+
+    /**
+     * 是否术中植入物
+     */
+    private String isImplants;
+
+    /**
+     * 植入物名称
+     */
+    private String implantsName;
+
+    /**
+     * 出血
+     */
+    private String bloodLoss;
+
+    /**
+     * 术中所见
+     */
+    private String intraoperativeView;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 手术经过及处理
+     */
+    private String operationProcess;
+
+    /**
+     * 记录医生
+     */
+    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 getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getPreoperationDiagnosis() {
+        return preoperationDiagnosis;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getPostoperativeDiagnosis() {
+        return postoperativeDiagnosis;
+    }
+
+    public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
+        this.postoperativeDiagnosis = postoperativeDiagnosis;
+    }
+    public String getOperationSurgeon() {
+        return operationSurgeon;
+    }
+
+    public void setOperationSurgeon(String operationSurgeon) {
+        this.operationSurgeon = operationSurgeon;
+    }
+    public String getFirstHelping() {
+        return firstHelping;
+    }
+
+    public void setFirstHelping(String firstHelping) {
+        this.firstHelping = firstHelping;
+    }
+    public String getSecondHelping() {
+        return secondHelping;
+    }
+
+    public void setSecondHelping(String secondHelping) {
+        this.secondHelping = secondHelping;
+    }
+    public String getNarcosisDoctor() {
+        return narcosisDoctor;
+    }
+
+    public void setNarcosisDoctor(String narcosisDoctor) {
+        this.narcosisDoctor = narcosisDoctor;
+    }
+    public String getNarcosisType() {
+        return narcosisType;
+    }
+
+    public void setNarcosisType(String narcosisType) {
+        this.narcosisType = narcosisType;
+    }
+    public String getCutType() {
+        return cutType;
+    }
+
+    public void setCutType(String cutType) {
+        this.cutType = cutType;
+    }
+    public String getPathologicalDiagnosis() {
+        return pathologicalDiagnosis;
+    }
+
+    public void setPathologicalDiagnosis(String pathologicalDiagnosis) {
+        this.pathologicalDiagnosis = pathologicalDiagnosis;
+    }
+    public String getIsImplants() {
+        return isImplants;
+    }
+
+    public void setIsImplants(String isImplants) {
+        this.isImplants = isImplants;
+    }
+    public String getImplantsName() {
+        return implantsName;
+    }
+
+    public void setImplantsName(String implantsName) {
+        this.implantsName = implantsName;
+    }
+    public String getBloodLoss() {
+        return bloodLoss;
+    }
+
+    public void setBloodLoss(String bloodLoss) {
+        this.bloodLoss = bloodLoss;
+    }
+    public String getIntraoperativeView() {
+        return intraoperativeView;
+    }
+
+    public void setIntraoperativeView(String intraoperativeView) {
+        this.intraoperativeView = intraoperativeView;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    public String getOperationProcess() {
+        return operationProcess;
+    }
+
+    public void setOperationProcess(String operationProcess) {
+        this.operationProcess = operationProcess;
+    }
+    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 "StrOperativeNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", operationDate=" + operationDate +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", preoperationDiagnosis=" + preoperationDiagnosis +
+            ", operationName=" + operationName +
+            ", postoperativeDiagnosis=" + postoperativeDiagnosis +
+            ", operationSurgeon=" + operationSurgeon +
+            ", firstHelping=" + firstHelping +
+            ", secondHelping=" + secondHelping +
+            ", narcosisDoctor=" + narcosisDoctor +
+            ", narcosisType=" + narcosisType +
+            ", cutType=" + cutType +
+            ", pathologicalDiagnosis=" + pathologicalDiagnosis +
+            ", isImplants=" + isImplants +
+            ", implantsName=" + implantsName +
+            ", bloodLoss=" + bloodLoss +
+            ", intraoperativeView=" + intraoperativeView +
+            ", postoperativeNotice=" + postoperativeNotice +
+            ", operationProcess=" + operationProcess +
+            ", 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/StrPeriodConclusion.java

@@ -0,0 +1,401 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 阶段小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrPeriodConclusion 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 participant;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊治经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 目前情况
+     */
+    private String presentSituation;
+
+    /**
+     * 诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    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 getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getPresentSituation() {
+        return presentSituation;
+    }
+
+    public void setPresentSituation(String presentSituation) {
+        this.presentSituation = presentSituation;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    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 "StrPeriodConclusion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", participant=" + participant +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", presentSituation=" + presentSituation +
+            ", treatPlan=" + treatPlan +
+            ", 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/StrPreoperativeDiscussion.java

@@ -0,0 +1,466 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术前讨论小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrPreoperativeDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 讨论时间
+     */
+    private Date discussTime;
+
+    /**
+     * 讨论方式
+     */
+    private String discussType;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术指征与禁忌
+     */
+    private String operationIndication;
+
+    /**
+     * 可替代的方案
+     */
+    private String replacePlan;
+
+    /**
+     * 拟施手术方式、名称及可能的变更与禁忌症
+     */
+    private String operationName;
+
+    /**
+     * 拟施麻醉方式
+     */
+    private String anesthesiaType;
+
+    /**
+     * 术前准备
+     */
+    private String preoperationPrepare;
+
+    /**
+     * 主要术中、术后风险及防范措施
+     */
+    private String intraoperativeRisk;
+
+    /**
+     * 术中注意事项
+     */
+    private String intraoperativeNotice;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 记录医生
+     */
+    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 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 String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    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 getDiscussTime() {
+        return discussTime;
+    }
+
+    public void setDiscussTime(Date discussTime) {
+        this.discussTime = discussTime;
+    }
+    public String getDiscussType() {
+        return discussType;
+    }
+
+    public void setDiscussType(String discussType) {
+        this.discussType = discussType;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getPreoperationDiagnosis() {
+        return preoperationDiagnosis;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getOperationIndication() {
+        return operationIndication;
+    }
+
+    public void setOperationIndication(String operationIndication) {
+        this.operationIndication = operationIndication;
+    }
+    public String getReplacePlan() {
+        return replacePlan;
+    }
+
+    public void setReplacePlan(String replacePlan) {
+        this.replacePlan = replacePlan;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getAnesthesiaType() {
+        return anesthesiaType;
+    }
+
+    public void setAnesthesiaType(String anesthesiaType) {
+        this.anesthesiaType = anesthesiaType;
+    }
+    public String getPreoperationPrepare() {
+        return preoperationPrepare;
+    }
+
+    public void setPreoperationPrepare(String preoperationPrepare) {
+        this.preoperationPrepare = preoperationPrepare;
+    }
+    public String getIntraoperativeRisk() {
+        return intraoperativeRisk;
+    }
+
+    public void setIntraoperativeRisk(String intraoperativeRisk) {
+        this.intraoperativeRisk = intraoperativeRisk;
+    }
+    public String getIntraoperativeNotice() {
+        return intraoperativeNotice;
+    }
+
+    public void setIntraoperativeNotice(String intraoperativeNotice) {
+        this.intraoperativeNotice = intraoperativeNotice;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    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 "StrPreoperativeDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", sex=" + sex +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", discussTime=" + discussTime +
+            ", discussType=" + discussType +
+            ", participant=" + participant +
+            ", briefNote=" + briefNote +
+            ", preoperationDiagnosis=" + preoperationDiagnosis +
+            ", operationIndication=" + operationIndication +
+            ", replacePlan=" + replacePlan +
+            ", operationName=" + operationName +
+            ", anesthesiaType=" + anesthesiaType +
+            ", preoperationPrepare=" + preoperationPrepare +
+            ", intraoperativeRisk=" + intraoperativeRisk +
+            ", intraoperativeNotice=" + intraoperativeNotice +
+            ", postoperativeNotice=" + postoperativeNotice +
+            ", 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/StrRescueNote.java

@@ -0,0 +1,362 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 抢救记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrRescueNote 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 startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 抢救措施
+     */
+    private String resuscitation;
+
+    /**
+     * 参加抢救的医务人员姓名及专业技术职称
+     */
+    private String rescueMan;
+
+    /**
+     * 记录医生
+     */
+    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 getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getResuscitation() {
+        return resuscitation;
+    }
+
+    public void setResuscitation(String resuscitation) {
+        this.resuscitation = resuscitation;
+    }
+    public String getRescueMan() {
+        return rescueMan;
+    }
+
+    public void setRescueMan(String rescueMan) {
+        this.rescueMan = rescueMan;
+    }
+    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 "StrRescueNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", briefNote=" + briefNote +
+            ", resuscitation=" + resuscitation +
+            ", rescueMan=" + rescueMan +
+            ", 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/StrTransferInNote.java

@@ -0,0 +1,427 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转入记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrTransferInNote 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 transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    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 getTransferInDate() {
+        return transferInDate;
+    }
+
+    public void setTransferInDate(Date 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 getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getCurrentSituation() {
+        return currentSituation;
+    }
+
+    public void setCurrentSituation(String currentSituation) {
+        this.currentSituation = currentSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    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 "StrTransferInNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transferInDate=" + transferInDate +
+            ", transferOutDept=" + transferOutDept +
+            ", transferInDept=" + transferInDept +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", currentSituation=" + currentSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", 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/StrTransferOutNote.java

@@ -0,0 +1,427 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转出记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrTransferOutNote 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 transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    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 getTransferInDate() {
+        return transferInDate;
+    }
+
+    public void setTransferInDate(Date 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 getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getCurrentSituation() {
+        return currentSituation;
+    }
+
+    public void setCurrentSituation(String currentSituation) {
+        this.currentSituation = currentSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    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 "StrTransferOutNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transferInDate=" + transferInDate +
+            ", transferOutDept=" + transferOutDept +
+            ", transferInDept=" + transferInDept +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", currentSituation=" + currentSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", 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/StrWardRecord.java

@@ -0,0 +1,388 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 查房记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrWardRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 查房日期
+     */
+    private Date wardDate;
+
+    /**
+     * 查房医生
+     */
+    private String wardDoctor;
+
+    /**
+     * 标题
+     */
+    private String wardTitle;
+
+    /**
+     * 病情记录
+     */
+    private String wardContent;
+
+    /**
+     * S
+     */
+    private String wardS;
+
+    /**
+     * O
+     */
+    private String wardO;
+
+    /**
+     * A
+     */
+    private String wardA;
+
+    /**
+     * P
+     */
+    private String wardP;
+
+    /**
+     * 记录医生
+     */
+    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 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 String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    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;
+    }
+
+    public void setWardDoctor(String wardDoctor) {
+        this.wardDoctor = wardDoctor;
+    }
+    public String getWardTitle() {
+        return wardTitle;
+    }
+
+    public void setWardTitle(String wardTitle) {
+        this.wardTitle = wardTitle;
+    }
+    public String getWardContent() {
+        return wardContent;
+    }
+
+    public void setWardContent(String wardContent) {
+        this.wardContent = wardContent;
+    }
+    public String getWardS() {
+        return wardS;
+    }
+
+    public void setWardS(String wardS) {
+        this.wardS = wardS;
+    }
+    public String getWardO() {
+        return wardO;
+    }
+
+    public void setWardO(String wardO) {
+        this.wardO = wardO;
+    }
+    public String getWardA() {
+        return wardA;
+    }
+
+    public void setWardA(String wardA) {
+        this.wardA = wardA;
+    }
+    public String getWardP() {
+        return wardP;
+    }
+
+    public void setWardP(String wardP) {
+        this.wardP = wardP;
+    }
+    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 "StrWardRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", sex=" + sex +
+            ", recordDate=" + recordDate +
+            ", wardDate=" + wardDate +
+            ", wardDoctor=" + wardDoctor +
+            ", wardTitle=" + wardTitle +
+            ", wardContent=" + wardContent +
+            ", wardS=" + wardS +
+            ", wardO=" + wardO +
+            ", wardA=" + wardA +
+            ", wardP=" + wardP +
+            ", 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/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/ConsoleByDeptFacade.java

@@ -501,8 +501,8 @@ public class ConsoleByDeptFacade {
         filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
         //没有医生过滤时增加全科室数据
-        if (StringUtil.isBlank(filterOrderByDeptVO.getName())
-                || filterOrderByDeptVO.getName().equals(filterOrderByDeptVO.getDeptName())) {
+        if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())
+                || filterOrderByDeptVO.getDeptName().equals(filterOrderByDeptVO.getDeptName())) {
             HomePageNumDTO item = getGlobleRecord(records, filterOrderByDeptVO.getDeptName());
             if (item != null) {
                 records.add(0, item);
@@ -657,4 +657,4 @@ public class ConsoleByDeptFacade {
         IPage<QcResultShortDTO> page = behospitalInfoFacade.qcResultShortByDeptPage(qcResultShortPageVO);
         return page;
     }
-}
+}

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

@@ -93,19 +93,19 @@ public class ConsoleExportFacade {
      * @return
      */
     public void levelExport(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<LevelStatisticsDTO> records = consoleFacade.levelStatistics(filterOrderVO);
+        List<LevelStatisticsDTO> records = consoleFacade.levelStatisticsStr(filterOrderVO);
         String fileName = "各科室缺陷占比.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsDTO.class, fileName, response, 12.8f);
     }
 
     /**
-     * 各科室缺陷占比（组合）-台州
+     * 各科室缺陷占比（组合）-台州-导出
      *
      * @param filterOrderVO
      * @return
      */
     public void levelExport_TZ(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<LevelStatisticsTZDTO> records = consoleFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        List<LevelStatisticsTZDTO> records = consoleFacade.levelStatisticsByDeptStr_TZ(filterOrderVO);
         String fileName = "各科室缺陷占比-台州.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsTZDTO.class, fileName, response, 12.8f);
     }
@@ -222,9 +222,9 @@ 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();
@@ -254,9 +254,9 @@ 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();
@@ -298,9 +298,9 @@ 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();
@@ -322,7 +322,7 @@ public class ConsoleExportFacade {
     }
 
     /**
-     * 病案首页不合格数
+     * 病案首页不合格/合格数
      *
      * @param qcResultShortPageVO
      * @return
@@ -330,9 +330,9 @@ 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();
@@ -349,7 +349,13 @@ public class ConsoleExportFacade {
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.badLevelPagePageExport(qcResultShortPageVO);
-        String fileName = "病案首页不合格数病历详情页.xls";
+        String fileName = null;
+        if("不合格数".equals(qcResultShortPageVO.getTitleName())){
+             fileName = "病案首页不合格数病历详情页.xls";
+        }else{
+             fileName = "病案首页合格数病历详情页.xls";
+        }
+
         ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
     }
 
@@ -362,7 +368,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);
 
@@ -422,9 +428,9 @@ 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();
@@ -454,9 +460,9 @@ 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();

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

@@ -160,14 +160,81 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageScore(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterFacade.filterVOSet(filterVO);
+        filterFacade.filterVOSame(filterVO);
         List<AverageStatisticsDTO> averageScoreList = averageStatisticsAggregate.getAverageScore(filterVO);
+
+        AverageStatisticsDTO item = getGlobleAverageTitle(averageScoreList);
+            if (item != null) {
+                averageScoreList.add(0, item);
+            }
+
         if (ListUtil.isNotEmpty(averageScoreList)) {
             retMap.put("各科室质控平均分", averageScoreList);
         }
         return retMap;
     }
 
+    /**
+     * 增加全院记录
+     *
+     * @param records
+     * @return
+     */
+    public AverageStatisticsDTO getGlobleAverageTitle(List<AverageStatisticsDTO> records) {
+        DecimalFormat df = new DecimalFormat("#0.00");
+        AverageStatisticsDTO item = new AverageStatisticsDTO();
+        if (ListUtil.isEmpty(records)) {
+            return null;
+        }
+
+        //数量
+        Integer num = records
+                .stream()
+                .map(AverageStatisticsDTO::getNum)
+                .reduce(0, Integer::sum);
+
+        //同期数量
+        Integer sameNum = records
+                .stream()
+                .map(AverageStatisticsDTO::getSameNum)
+                .reduce(0, Integer::sum);
+
+        Double totleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        Double sameTotleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getSameTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        Double averageValue = 0d;
+        if(0 != num){
+             averageValue = BigDecimal.valueOf(totleValue)
+                    .divide(BigDecimal.valueOf(num), 2, RoundingMode.HALF_UP)
+                    .doubleValue();
+        }
+        Double lastYearAverageValue = 0d;
+        if(0 != sameNum) {
+            lastYearAverageValue = BigDecimal.valueOf(sameTotleValue)
+                    .divide(BigDecimal.valueOf(sameNum), 2, RoundingMode.HALF_UP)
+                    .doubleValue();
+        }
+
+        item.setName("全院");
+        item.setNum(num);
+        item.setSameNum(sameNum);
+        item.setAverageValue(averageValue);
+        item.setTotleValue(totleValue);
+        item.setSameTotleValue(sameTotleValue);
+        item.setLastYearAverageValue(lastYearAverageValue);
+        return item;
+    }
+
+
     /**
      * 各科室质控平均分（首页）-根据内外科系统统计
      *
@@ -175,7 +242,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO) {
-        filterFacade.filterVOSet(filterVO);
+        filterFacade.filterVOSame(filterVO);
         List<AverageStatisticsDTO> retAverageScoreList = Lists.newLinkedList();
         List<AverageStatisticsDTO> averageScoreList = qcresultInfoFacade.getAverageScoreByDeptClass(filterVO);
         Integer limitCount = filterVO.getLimitCount();
@@ -183,9 +250,77 @@ public class ConsoleFacade {
         if (ListUtil.isNotEmpty(averageScoreList)) {
             retAverageScoreList = averageStatisticsAggregate.getLimitAverageList(averageScoreList, limitCount);
         }
+        AverageStatisticsDTO item = getGlobleInOutTitle(retAverageScoreList,filterVO);
+        if (item != null) {
+            retAverageScoreList.add(0, item);
+        }
         return retAverageScoreList;
     }
 
+    /**
+     * 增加内外科记录
+     *
+     * @param records
+     * @return
+     */
+    public AverageStatisticsDTO getGlobleInOutTitle(List<AverageStatisticsDTO> records,FilterVO filterVO) {
+        DecimalFormat df = new DecimalFormat("#0.00");
+        AverageStatisticsDTO item = new AverageStatisticsDTO();
+        if (ListUtil.isEmpty(records)) {
+            return null;
+        }
+
+        //数量
+        Integer num = records
+                .stream()
+                .map(AverageStatisticsDTO::getNum)
+                .reduce(0, Integer::sum);
+
+        //同期数量
+        Integer sameNum = records
+                .stream()
+                .map(AverageStatisticsDTO::getSameNum)
+                .reduce(0, Integer::sum);
+
+        Double totleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        Double sameTotleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getSameTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        Double averageValue = 0d;
+        if(0 != num){
+            averageValue = BigDecimal.valueOf(totleValue)
+                    .divide(BigDecimal.valueOf(num), 2, RoundingMode.HALF_UP)
+                    .doubleValue();
+        }
+        Double lastYearAverageValue = 0d;
+        if(0 != sameNum) {
+            lastYearAverageValue = BigDecimal.valueOf(sameTotleValue)
+                    .divide(BigDecimal.valueOf(sameNum), 2, RoundingMode.HALF_UP)
+                    .doubleValue();
+        }
+
+    if("内科".equals(filterVO.getDeptClass())){
+        item.setName("内科系统");
+    }else{
+        item.setName("外科系统");
+    }
+        item.setNum(num);
+        item.setSameNum(sameNum);
+        item.setAverageValue(averageValue);
+        item.setTotleValue(totleValue);
+        item.setSameTotleValue(sameTotleValue);
+        item.setLastYearAverageValue(lastYearAverageValue);
+        return item;
+    }
+
     /**
      * 各科室甲级病历占比
      *
@@ -446,8 +581,254 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO) {
-        filterFacade.filterOrderVOSet(filterOrderVO);
+        filterFacade.filterOrderVOSame(filterOrderVO);
+        List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
+        //没有科室过滤时增加全院数据
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
+            LevelStatisticsDTO item = getGlobleTitle(records);
+            if (item != null) {
+                records.add(0, item);
+            }
+        }
+        if(ListUtil.isNotEmpty(records)){
+            for (LevelStatisticsDTO record : records) {
+                BigDecimalMethod(record);
+            }
+        }
+        return records;
+    }
+
+    /**
+     * 各科室缺陷占比（组合）-导出
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<LevelStatisticsDTO> levelStatisticsStr(FilterOrderVO filterOrderVO) {
+        filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
+        //没有科室过滤时增加全院数据
+        if (StringUtil.isBlank(filterOrderVO.getDeptName()) || filterOrderVO.getDeptName().equals("全院")) {
+            LevelStatisticsDTO item = getGlobleTitle(records);
+            if (item != null) {
+                records.add(0, item);
+            }
+        }
+        if(ListUtil.isNotEmpty(records)){
+            for (LevelStatisticsDTO record : records) {
+                BigDecimalStrExport(record);
+            }
+        }
+        return records;
+    }
+
+    /**
+     * 增加全院记录
+     *
+     * @param records
+     * @return
+     */
+    public LevelStatisticsDTO getGlobleTitle(List<LevelStatisticsDTO> records) {
+        DecimalFormat df = new DecimalFormat("#0.00");
+        LevelStatisticsDTO item = new LevelStatisticsDTO();
+        if (ListUtil.isEmpty(records)) {
+            return null;
+        }
+
+        //缺陷总数
+        Integer entryNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getEntryNum)
+                .reduce(0, Integer::sum);
+        if (entryNum == null || entryNum == 0) {
+            return null;
+        }
+        //同比总数
+        Integer sameNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSameNum)
+                .reduce(0, Integer::sum);
+
+        //质控病历数
+        Integer mrNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getMrNum)
+                .reduce(0, Integer::sum);
+        //同比病历数
+        Integer sameMrNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSameMrNum)
+                .reduce(0, Integer::sum);
+
+        //质控评分
+        Double totleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+        //同比质控评分
+        Double sameTotleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getSameTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        //质控平均分
+        Double averageValue = BigDecimal.valueOf(totleValue)
+                .divide(BigDecimal.valueOf(mrNum), 2, RoundingMode.HALF_UP)
+                .doubleValue();
+
+        Double sameAvgValue = 0d;
+        //同比平均分
+        if(0d != sameTotleValue){
+            sameAvgValue = BigDecimal.valueOf(sameTotleValue)
+                    .divide(BigDecimal.valueOf(sameMrNum), 2, RoundingMode.HALF_UP)
+                    .doubleValue();
+        }
+
+
+        //甲级病历数
+        Integer firstLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getFirstLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比甲级病历数
+        Integer sameFirstLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSameFirstLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //乙级病历数
+        Integer secondLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSecondLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比乙级病历数
+        Integer sameSecondLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSameSecondLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //丙级病历数
+        Integer thirdLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getThirdLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比丙级病历数
+        Integer sameThirdLevelNum = records
+                .stream()
+                .map(LevelStatisticsDTO::getSameThirdLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //甲级病历占比
+        Double firstLevelPercent = BigDecimal.valueOf(firstLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String firstLevelPercentStr
+                = df.format(BigDecimal.valueOf(firstLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        //同比甲级病历占比
+        Double sameFirstLevelPercent = 0d;
+        String sameFirstLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ){
+            sameFirstLevelPercent = BigDecimal.valueOf(sameFirstLevelNum)
+                    .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                    .doubleValue();
+            sameFirstLevelPercentStr
+                    = df.format(BigDecimal.valueOf(sameFirstLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+
+
+        //乙级病历占比
+        Double secondLevelPercent = BigDecimal.valueOf(secondLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String secondLevelPercentStr
+                = df.format(BigDecimal.valueOf(secondLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+
+        //同比乙级病历占比
+        Double sameSecondLevelPercent = 0d;
+        String sameSecondLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ){
+            sameSecondLevelPercent = BigDecimal.valueOf(sameSecondLevelNum)
+                    .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                    .doubleValue();
+            sameSecondLevelPercentStr
+                    = df.format(BigDecimal.valueOf(sameSecondLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+        //丙级病历占比
+        Double thirdLevelPercent = BigDecimal.valueOf(thirdLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String thirdLevelPercentStr
+                = df.format(BigDecimal.valueOf(thirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+
+        //同比丙级病历占比
+        Double sameThirdLevelPercent = 0d;
+        String sameThirdLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ) {
+            sameThirdLevelPercent = BigDecimal.valueOf(sameThirdLevelNum)
+                    .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                    .doubleValue();
+            sameThirdLevelPercentStr
+                    = df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+        item.setDeptName("全院");
+        item.setEntryNum(entryNum);
+        item.setSameNum(sameNum);
+        item.setMrNum(mrNum);
+        item.setSameMrNum(sameMrNum);
+        item.setTotleValue(totleValue);
+        item.setSameTotleValue(sameTotleValue);
+        item.setAverageValue(averageValue);
+        item.setSameAvgValue(sameAvgValue);
+        item.setFirstLevelNum(firstLevelNum);
+        item.setSameFirstLevelNum(sameFirstLevelNum);
+        item.setFirstLevelPercent(firstLevelPercent);
+        item.setSameFirstLevelPercent(sameFirstLevelPercent);
+        item.setFirstLevelPercentStr(firstLevelPercentStr);
+        item.setSameFirstLevelPercentStr(sameFirstLevelPercentStr);
+        item.setSecondLevelNum(secondLevelNum);
+        item.setSameSecondLevelNum(sameSecondLevelNum);
+        item.setSecondLevelPercent(secondLevelPercent);
+        item.setSameSecondLevelPercent(sameSecondLevelPercent);
+        item.setSecondLevelPercentStr(secondLevelPercentStr);
+        item.setSameSecondLevelPercentStr(sameSecondLevelPercentStr);
+        item.setThirdLevelNum(thirdLevelNum);
+        item.setSameThirdLevelNum(sameThirdLevelNum);
+        item.setThirdLevelPercent(thirdLevelPercent);
+        item.setSameThirdLevelPercent(sameThirdLevelPercent);
+        item.setThirdLevelPercentStr(thirdLevelPercentStr);
+        item.setSameThirdLevelPercentStr(sameThirdLevelPercentStr);
+        return item;
+    }
+
+    /**
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）-导出
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptStr_TZ(FilterOrderVO filterOrderVO) {
+        filterFacade.filterOrderVOSame(filterOrderVO);
+        List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        if( StringUtil.isBlank(filterOrderVO.getDeptName())){
+            LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
+            if (item != null) {
+                records.add(0, item);
+            }
+        }
+        if(ListUtil.isNotEmpty(records)){
+           for (LevelStatisticsTZDTO record : records) {
+               BigDecimalStrExport(record);
+           }
+       }
+
         return records;
     }
 
@@ -458,11 +839,393 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
-        filterFacade.filterOrderVOSet(filterOrderVO);
+        filterFacade.filterOrderVOSame(filterOrderVO);
         List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+            if( StringUtil.isBlank(filterOrderVO.getDeptName())){
+                LevelStatisticsTZDTO item = getGlobleRecords(records,filterOrderVO);
+                if (item != null) {
+                    records.add(0, item);
+                }
+            }
+
+
+        if(ListUtil.isNotEmpty(records)){
+            for (LevelStatisticsTZDTO record : records) {
+                BigDecimalMethod(record);
+            }
+        }
+
         return records;
     }
 
+    /**
+     * 增加全院记录
+     *
+     * @param records
+     * @return
+     */
+    public LevelStatisticsTZDTO getGlobleRecords(List<LevelStatisticsTZDTO> records,FilterOrderVO filterOrderVO) {
+        DecimalFormat df = new DecimalFormat("#0.00");
+        LevelStatisticsTZDTO item = new LevelStatisticsTZDTO();
+        if (ListUtil.isEmpty(records)) {
+            return null;
+        }
+
+        //缺陷总数
+        Integer entryNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getEntryNum)
+                .reduce(0, Integer::sum);
+        if (entryNum == null || entryNum == 0) {
+            return null;
+        }
+        //同比总数
+        Integer sameNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSameNum)
+                .reduce(0, Integer::sum);
+
+        //质控病历数
+        Integer mrNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getMrNum)
+                .reduce(0, Integer::sum);
+        //同比病历数
+        Integer sameMrNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSameMrNum)
+                .reduce(0, Integer::sum);
+
+        //质控评分
+        Double totleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+        //同比质控评分
+        Double sameTotleValue = records
+                .stream()
+                .map(i -> BigDecimal.valueOf(i.getSameTotleValue()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .doubleValue();
+
+        //质控平均分
+        Double averageValue = BigDecimal.valueOf(totleValue)
+                .divide(BigDecimal.valueOf(mrNum), 2, RoundingMode.HALF_UP)
+                .doubleValue();
+
+        Double sameAvgValue = 0d;
+        //同比平均分
+        if(0d != sameTotleValue){
+             sameAvgValue = BigDecimal.valueOf(sameTotleValue)
+                .divide(BigDecimal.valueOf(sameMrNum), 2, RoundingMode.HALF_UP)
+                .doubleValue();
+        }
+
+
+        //甲级病历数
+        Integer firstLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getFirstLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比甲级病历数
+        Integer sameFirstLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSameFirstLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //乙级病历数
+        Integer secondLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSecondLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比乙级病历数
+        Integer sameSecondLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSameSecondLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //丙级病历数
+        Integer thirdLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getThirdLevelNum)
+                .reduce(0, Integer::sum);
+
+        //同比丙级病历数
+        Integer sameThirdLevelNum = records
+                .stream()
+                .map(LevelStatisticsTZDTO::getSameThirdLevelNum)
+                .reduce(0, Integer::sum);
+
+
+        //甲级病历占比
+        Double firstLevelPercent = BigDecimal.valueOf(firstLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String firstLevelPercentStr
+                = df.format(BigDecimal.valueOf(firstLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        //同比甲级病历占比
+        Double sameFirstLevelPercent = 0d;
+        String sameFirstLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ){
+             sameFirstLevelPercent = BigDecimal.valueOf(sameFirstLevelNum)
+                    .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                    .doubleValue();
+             sameFirstLevelPercentStr
+                    = df.format(BigDecimal.valueOf(sameFirstLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+
+
+        //乙级病历占比
+        Double secondLevelPercent = BigDecimal.valueOf(secondLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String secondLevelPercentStr
+                = df.format(BigDecimal.valueOf(secondLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+
+        //同比乙级病历占比
+        Double sameSecondLevelPercent = 0d;
+        String sameSecondLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ){
+         sameSecondLevelPercent = BigDecimal.valueOf(sameSecondLevelNum)
+                .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+         sameSecondLevelPercentStr
+                = df.format(BigDecimal.valueOf(sameSecondLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+        //丙级病历占比
+        Double thirdLevelPercent = BigDecimal.valueOf(thirdLevelNum)
+                .divide(BigDecimal.valueOf(mrNum), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String thirdLevelPercentStr
+                = df.format(BigDecimal.valueOf(thirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+
+        //同比丙级病历占比
+        Double sameThirdLevelPercent = 0d;
+        String sameThirdLevelPercentStr = "0.00%";
+        if(0 != sameFirstLevelNum ) {
+             sameThirdLevelPercent = BigDecimal.valueOf(sameThirdLevelNum)
+                    .divide(BigDecimal.valueOf(sameMrNum), 4, RoundingMode.HALF_UP)
+                    .doubleValue();
+             sameThirdLevelPercentStr
+                    = df.format(BigDecimal.valueOf(sameThirdLevelPercent).multiply(BigDecimal.valueOf(100))) + "%";
+        }
+        if (StringUtil.isBlank(filterOrderVO.getDeptClass()) || filterOrderVO.getDeptClass().equals("全院")) {
+            item.setDeptName("全院");
+        }else if("内科".equals(filterOrderVO.getDeptClass())){
+            item.setDeptClassId("01");
+            item.setDeptClass("内科");
+            item.setDeptName("全部科室");
+        }else if("外科".equals(filterOrderVO.getDeptClass())){
+            item.setDeptClassId("1030000");
+            item.setDeptClass("外科");
+            item.setDeptName("全部科室");
+        }
+        item.setEntryNum(entryNum);
+        item.setSameNum(sameNum);
+        item.setMrNum(mrNum);
+        item.setSameMrNum(sameMrNum);
+        item.setTotleValue(totleValue);
+        item.setSameTotleValue(sameTotleValue);
+        item.setAverageValue(averageValue);
+        item.setSameAvgValue(sameAvgValue);
+        item.setFirstLevelNum(firstLevelNum);
+        item.setSameFirstLevelNum(sameFirstLevelNum);
+        item.setFirstLevelPercent(firstLevelPercent);
+        item.setSameFirstLevelPercent(sameFirstLevelPercent);
+        item.setFirstLevelPercentStr(firstLevelPercentStr);
+        item.setSameFirstLevelPercentStr(sameFirstLevelPercentStr);
+        item.setSecondLevelNum(secondLevelNum);
+        item.setSameSecondLevelNum(sameSecondLevelNum);
+        item.setSecondLevelPercent(secondLevelPercent);
+        item.setSameSecondLevelPercent(sameSecondLevelPercent);
+        item.setSecondLevelPercentStr(secondLevelPercentStr);
+        item.setSameSecondLevelPercentStr(sameSecondLevelPercentStr);
+        item.setThirdLevelNum(thirdLevelNum);
+        item.setSameThirdLevelNum(sameThirdLevelNum);
+        item.setThirdLevelPercent(thirdLevelPercent);
+        item.setSameThirdLevelPercent(sameThirdLevelPercent);
+        item.setThirdLevelPercentStr(thirdLevelPercentStr);
+        item.setSameThirdLevelPercentStr(sameThirdLevelPercentStr);
+        return item;
+    }
+
+
+    public void BigDecimalStrExport(LevelStatisticsDTO 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;
+    }
+
     /**
      * 病案首页合格率占比
      *
@@ -473,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);
@@ -828,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);
@@ -968,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++;
@@ -1110,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();
@@ -1175,7 +1938,7 @@ public class ConsoleFacade {
     }
 
     /**
-     * 不合格数病历号（内页）
+     * 不合格/合格数病历号（内页）
      *
      * @param qcResultPageVO
      * @return
@@ -1326,7 +2089,29 @@ public class ConsoleFacade {
      */
     public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO) {
         filterFacade.getMedicalCheckVOSet(filterVO);
-        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalCheck(filterVO);
+        //colums
+        QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
+        hospitalSetQueryWrapper.eq("is_deleted", 'N')
+                .eq("hospital_id", filterVO.getHospitalId())
+                .eq("code", "medical_check_form");
+        SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
+
+        //表头生成
+        List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
+
+        //目标条目
+        List<Long> casesEntryIds = Lists.newArrayList();
+        //遍历第一个条目
+        for (String valueStr : columnSet) {
+            if (StringUtil.isBlank(valueStr)) {
+                continue;
+            }
+            String[] keyValue = valueStr.split("--");
+            if (keyValue != null || keyValue.length > 1) {
+                casesEntryIds.add(Long.valueOf(keyValue[0]));
+            }
+        }
+        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalCheck(filterVO,casesEntryIds);
         return medicalCheck;
     }
 
@@ -1369,7 +2154,7 @@ public class ConsoleFacade {
         orderNo++;
         ColumnDTO columnMedicalName = new ColumnDTO();
         columnMedicalName.setOrderNo(orderNo);
-        columnMedicalName.setFieldName("medicalName");
+        columnMedicalName.setFieldName("doctorName");
         columnMedicalName.setColumnName("医疗组");
         columnMedicalName.setIsShow(1);
         columns.add(columnMedicalName);
@@ -1380,7 +2165,7 @@ public class ConsoleFacade {
                 ColumnDTO columnNum = new ColumnDTO();
                 columnNum.setOrderNo(orderNo);
                 columnNum.setId(Long.valueOf(keyValue[0]));
-                columnNum.setFieldName("entry_" + keyValue[0] + "_num");
+                columnNum.setFieldName("entry_" + keyValue[0] + "_name");
                 columnNum.setColumnName(keyValue[1]);
                 columnNum.setIsShow(1);
                 columns.add(columnNum);

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

@@ -8,6 +8,9 @@ import com.diagbot.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -86,6 +89,50 @@ public class FilterFacade {
         return dateStr;
     }
 
+    /**
+     * 获取上一年同期开始结束时间
+     *
+     * @param date
+     * @return
+     */
+    public String getStaEndDate(String date) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date dateStart = new Date();
+        try {
+             dateStart = formatter.parse(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(dateStart);
+        c.add(Calendar.YEAR, -1);
+        Date y = c.getTime();
+        String newDate = formatter.format(y);
+        return newDate;
+    }
+
+    /**
+     * 获取上一年同期开始结束时间
+     *
+     * @param date
+     * @return
+     */
+    public String getLastStartEndDate(String date) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        Date dateStart = new Date();
+        try {
+            dateStart = formatter.parse(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar c = Calendar.getInstance();
+        c.setTime(dateStart);
+        c.add(Calendar.YEAR, -1);
+        Date y = c.getTime();
+        String newDate = formatter.format(y);
+        return newDate;
+    }
+
     /**
      * 获取上一统计周期（上月/去年）的起始时间
      *
@@ -97,6 +144,39 @@ public class FilterFacade {
         return getStartDateStr(type, null);
     }
 
+    /**
+     * 入参拼接-同比
+     *
+     * @param filterVO
+     */
+    public void filterVOSetSame(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+        if (StringUtil.isBlank(filterVO.getStartDate())) {
+            String startDate = getStartDateStr(filterVO.getType(), null);
+            filterVO.setStartDate(startDate);
+            String lastStartDate = getLastStartEndDate(startDate);
+            filterVO.setLastStartDate(lastStartDate);
+        }else{
+            String lastStartDate = getLastStartEndDate(filterVO.getStartDate());
+            filterVO.setLastStartDate(lastStartDate);
+        }
+        if (StringUtil.isBlank(filterVO.getEndDate())) {
+            String endDate = getEndDateStr(filterVO.getType(), null);
+            filterVO.setEndDate(endDate);
+            String lastEndDate = getLastStartEndDate(endDate);
+            filterVO.setLastEndDate(lastEndDate);
+        }else{
+            String lastEndDate = getLastStartEndDate(filterVO.getEndDate());
+            filterVO.setLastEndDate(lastEndDate);
+        }
+    }
+
     /**
      * 入参拼接
      *
@@ -193,6 +273,57 @@ public class FilterFacade {
     /**
      * 过滤条件设置
      *
+     * @param filterVO
+     */
+    public void filterVOSame(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+        if (StringUtil.isBlank(filterVO.getStartDate())) {
+            String startDate = getStartDateStr(filterVO.getType(), null);
+            filterVO.setStartDate(startDate);
+            String lastStartDate = getStaEndDate(startDate);
+            filterVO.setLastStartDate(lastStartDate);
+        }else{
+            String lastStartDate = getStaEndDate(filterVO.getStartDate());
+            filterVO.setLastStartDate(lastStartDate);
+        }
+        if (StringUtil.isBlank(filterVO.getEndDate())) {
+            String endDate = getEndDateStr(filterVO.getType(), null);
+            filterVO.setEndDate(endDate);
+            String lastEndDate = getStaEndDate(endDate);
+            filterVO.setLastEndDate(lastEndDate);
+        }else{
+            String lastEndDate = getStaEndDate(filterVO.getEndDate());
+            filterVO.setLastEndDate(lastEndDate);
+        }
+    }
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterOrderVO
+     */
+    public void filterOrderVOSame(FilterOrderVO filterOrderVO) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderVO, filterVO);
+        filterVOSetSame(filterVO);
+        filterOrderVO.setHospitalId(filterVO.getHospitalId());
+        filterOrderVO.setUserId(filterVO.getUserId());
+        filterOrderVO.setStartDate(filterVO.getStartDate());
+        filterOrderVO.setEndDate(filterVO.getEndDate());
+        filterOrderVO.setLastStartDate(filterVO.getLastStartDate());
+        filterOrderVO.setLastEndDate(filterVO.getLastEndDate());
+        filterOrderVO.setLimitCount(filterVO.getLimitCount());
+    }
+
+    /**
+     * 过滤条件设置-同比
+     *
      * @param filterOrderByDeptVO
      */
     public void filterOrderByDeptVOSet(FilterOrderByDeptVO filterOrderByDeptVO) {
@@ -256,8 +387,8 @@ 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)));*/

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

@@ -1,8 +1,7 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.MedLisResultDTO;
+import com.diagbot.dto.MedPacsResultDTO;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.MedPacsResult;
 import com.diagbot.service.impl.MedPacsResultServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -15,7 +14,7 @@ import java.util.List;
  */
 @Component
 public class MedPacsResultFacade extends MedPacsResultServiceImpl {
-    public List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo){
+    public List<MedPacsResultDTO> getMedPacsResultList(BehospitalInfo behospitalInfo){
         return getMedPacsResults(behospitalInfo);
     }
 }

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

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

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

@@ -16,6 +16,7 @@ import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.QcCasesEntryFindVO;
 import com.diagbot.vo.QcCasesEntryHospitalVO;
 import com.diagbot.vo.QcCasesEntryUpdataVO;
+import com.diagbot.vo.QcCasesEntryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -81,8 +82,8 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
      *
      * @return
      */
-    public List<QcCasesAllDTO> getQcCasesAlls() {
-        return  qcCasesFacade.getQcCasesAlls();
+    public List<QcCasesAllDTO> getQcCasesAlls(QcCasesEntryVO qcCasesEntryVO) {
+        return  qcCasesFacade.getQcCasesAlls(qcCasesEntryVO);
     }
 
     /**

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

@@ -12,9 +12,11 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.QcCasesEntryVO;
 import com.diagbot.vo.QcCasesQueryVO;
 import com.diagbot.vo.QcCasesSaveListVO;
 import com.diagbot.vo.QcCasesSaveVO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -72,9 +74,12 @@ public class QcCasesFacade extends QcCasesServiceImpl {
      *
      * @return 基础模块数据信息列表
      */
-    public List<QcCasesAllDTO> getQcCasesAlls() {
+    public List<QcCasesAllDTO> getQcCasesAlls(QcCasesEntryVO qcCasesEntryVO) {
         QueryWrapper<QcCases> qc = new QueryWrapper<>();
         qc.eq("is_deleted", IsDeleteEnum.N.getKey());
+        if(StringUtils.isNotBlank(qcCasesEntryVO.getCasesName())){
+            qc.like("name", qcCasesEntryVO.getCasesName());
+        }
         List<QcCases> data = list(qc);
         List<QcCasesAllDTO> dataNew = new ArrayList<QcCasesAllDTO>();
         dataNew = BeanUtil.listCopyTo(data, QcCasesAllDTO.class);

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

@@ -41,4 +41,20 @@ public class QcClientFacade {
 
         return qcServiceClient.extract(uri, queryVo);
     }
+
+    public Response<OutputInfo> analyseField(QueryVo queryVo) {
+        URI uri = null;
+        String code = "active_profiles_" + SpringContextUtil.getActiveProfile();
+        String url = sysHospitalSetFacade.getValue(Long.valueOf(queryVo.getHospitalId()), code);
+        if (StringUtil.isBlank(url)) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "配置表内找不到评分接口地址数据！");
+        }
+        try {
+            uri = new URI(url);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
+        }
+
+        return qcServiceClient.analyseField(uri, queryVo);
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/11/13 11:39
+ */
+@Component
+public class StrConsultationRecordFacade extends StrConsultationRecordServiceImpl {
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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