Merge remote-tracking branch 'origin/dev/20200923_1.5.0' into testone

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

doc/023.20200923v1.5.0/qc_initv1.5.0.sql

@@ -0,0 +1,68 @@
+use `qc`;
+DROP TABLE IF EXISTS `med_abnormal_info`;
+CREATE TABLE `med_abnormal_info`  (
+  `abnormal_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `module_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rec_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模块名称',
+  `param_in` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '入参',
+  `param_out` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '出参',
+  `ramark` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常描述',
+  `is_deleted` char(3) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime(0) NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime(0) NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  PRIMARY KEY (`abnormal_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 106 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+alter table med_consultation_note alter column is_deleted set default 'N';
+update  med_consultation_note set is_deleted = 'N';
+alter table med_consultation_apply alter column is_deleted set default 'N';
+update  med_consultation_apply set is_deleted = 'N';
+alter table med_consultation_result alter column is_deleted set default 'N';
+update  med_consultation_result set is_deleted = 'N';
+alter table med_admission_note alter column is_deleted set default 'N';
+update  med_admission_note set is_deleted = 'N';
+alter table med_leave_hospital alter column is_deleted set default 'N';
+update  med_leave_hospital set is_deleted = 'N';
+alter table med_crisis_note alter column is_deleted set default 'N';
+update  med_crisis_note set is_deleted = 'N';
+alter table med_operative_note alter column is_deleted set default 'N';
+update  med_operative_note set is_deleted = 'N';
+alter table med_rescue_note alter column is_deleted set default 'N';
+update  med_rescue_note set is_deleted = 'N';
+alter table med_preoperative_discussion alter column is_deleted set default 'N';
+update  med_preoperative_discussion set is_deleted = 'N';
+alter table med_operative_first_record alter column is_deleted set default 'N';
+update  med_operative_first_record set is_deleted = 'N';
+alter table med_ward_record alter column is_deleted set default 'N';
+update  med_ward_record set is_deleted = 'N';
+alter table med_death_discussion alter column is_deleted set default 'N';
+update  med_death_discussion set is_deleted = 'N';
+alter table med_death_note alter column is_deleted set default 'N';
+update  med_death_note set is_deleted = 'N';
+alter table med_difficult_case alter column is_deleted set default 'N';
+update  med_difficult_case set is_deleted = 'N';
+alter table med_ill_critically alter column is_deleted set default 'N';
+update med_ill_critically set is_deleted = 'N';
+alter table med_ill_seriousl alter column is_deleted set default 'N';
+update  med_ill_seriousl set is_deleted = 'N';
+alter table med_transfer_in_note alter column is_deleted set default 'N';
+update  med_transfer_in_note set is_deleted = 'N';
+alter table med_transfer_out_note alter column is_deleted set default 'N';
+update  med_transfer_out_note set is_deleted = 'N';
+alter table med_blood_result alter column is_deleted set default 'N';
+update  med_blood_result set is_deleted = 'N';
+alter table med_blood_transfusion alter column is_deleted set default 'N';
+update  med_blood_transfusion set is_deleted = 'N';
+alter table med_period_conclusion alter column is_deleted set default 'N';
+update  med_period_conclusion set is_deleted = 'N';
+alter table med_first_record alter column is_deleted set default 'N';
+update  med_first_record set is_deleted = 'N';
+
+
+
+

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 = '评分时间';
+

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

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

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

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

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

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

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

@@ -157,6 +157,13 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()
                 .antMatchers("/qc/data/sendCrisis").permitAll()
+                .antMatchers("/qc/data/deleteFlag").permitAll()
+                .antMatchers("/qc/data/placeFile").permitAll()
+                .antMatchers("/qc/data/sendLisResults").permitAll()
+                .antMatchers("/qc/data/sendPacsResults").permitAll()
+                .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
+                .antMatchers("/qc/data/analyseRec").permitAll()
+                .antMatchers("/qc/data/hisDataDeal").permitAll()
                 .antMatchers("/qc/doctoradvice/getPage").permitAll()
                 .antMatchers("/qc/medPacsInfo/getCheckPage").permitAll()
                 .antMatchers("/qc/medLisInfo/getExaminePage").permitAll()

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

@@ -201,6 +201,13 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendHomeDiagnose", request)
                 || matchers("/qc/data/sendHomeOperation", request)
                 || matchers("/qc/data/sendCrisis", request)
+                || matchers("/qc/data/deleteFlag", request)
+                || matchers("/qc/data/placeFile", request)
+                || matchers("/qc/data/sendLisResults", request)
+                || matchers("/qc/data/sendPacsResults", request)
+                || matchers("/qc/data/getColumnZhAndCh", request)
+                || matchers("/qc/data/analyseRec", request)
+                || matchers("/qc/data/hisDataDeal", request)
                 || matchers("/qc/doctoradvice/getPage", request)
                 || matchers("/qc/medPacsInfo/getCheckPage", request)
                 || matchers("/qc/medLisInfo/getExaminePage", request)

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

@@ -51,6 +51,11 @@ public class RecordContentDTO implements Serializable {
      */
     private String recId;
 
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
     /**
      * 病历类别编号
      */
@@ -61,4 +66,8 @@ public class RecordContentDTO implements Serializable {
      */
     private Long modeId;
 
+    /**
+     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
+     */
+    private int isParsed = 0;
 }

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

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

src/main/java/com/diagbot/entity/MedAdmissionNote.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 MedAdmissionNote 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 "MedAdmissionNote{" +
+            "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/MedBloodResult.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 MedBloodResult 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 "MedBloodResult{" +
+            "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/MedBloodTransfusion.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 MedBloodTransfusion 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 "MedBloodTransfusion{" +
+            "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/MedConsultationApply.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 MedConsultationApply 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 "MedConsultationApply{" +
+            "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/MedConsultationNote.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 MedConsultationNote 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 "MedConsultationNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatmentSituation=" + treatmentSituation +
+            ", consultationDate=" + consultationDate +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -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 MedConsultationResult 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 "MedConsultationResult{" +
+            "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/MedCrisisNote.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 MedCrisisNote 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 "MedCrisisNote{" +
+            "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/MedDeathDiscussion.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 MedDeathDiscussion 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 "MedDeathDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", deathReason=" + deathReason +
+            ", deathDate=" + deathDate +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchor=" + anchor +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussionContent=" + discussionContent +
+            ", anchorConclusion=" + anchorConclusion +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -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 MedDeathNote 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 "MedDeathNote{" +
+            "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/MedDifficultCase.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 MedDifficultCase 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 "MedDifficultCase{" +
+            "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/MedFirstRecord.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 MedFirstRecord 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 "MedFirstRecord{" +
+            "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/MedIllCritically.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 MedIllCritically 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 "MedIllCritically{" +
+            "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/MedIllSeriousl.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 MedIllSeriousl 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 "MedIllSeriousl{" +
+            "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/MedLeaveHospital.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 MedLeaveHospital 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 "MedLeaveHospital{" +
+            "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/MedLisResult.java

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

src/main/java/com/diagbot/entity/MedOperativeFirstRecord.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 MedOperativeFirstRecord 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 "MedOperativeFirstRecord{" +
+            "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/MedOperativeNote.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 MedOperativeNote 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 "MedOperativeNote{" +
+            "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/MedPacsResult.java

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

src/main/java/com/diagbot/entity/MedPeriodConclusion.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 MedPeriodConclusion 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 "MedPeriodConclusion{" +
+            "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/MedPreoperativeDiscussion.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 MedPreoperativeDiscussion 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 "MedPreoperativeDiscussion{" +
+            "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/MedRescueNote.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 MedRescueNote 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 "MedRescueNote{" +
+            "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/MedTransferInNote.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 MedTransferInNote 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 "MedTransferInNote{" +
+            "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/MedTransferOutNote.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 MedTransferOutNote 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 "MedTransferOutNote{" +
+            "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/MedWardRecord.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 MedWardRecord 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 "MedWardRecord{" +
+            "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/entity/QcType.java

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

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

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

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

@@ -0,0 +1,90 @@
+package com.diagbot.enums;
+
+import lombok.Setter;
+
+public enum CacheKeyEnum implements KeyedString {
+    BEHOSPITAL_INFO("入院记录", "medAdmissionNote"),
+    BLOOD_RESULT("输血后效果评价", "medBloodResult"),
+    BLOOD_TRANSFUSION("输血/血制品病程记录", "medBloodTransfusion"),
+    PERIOD_CONCLUSION("阶段小结", "medPeriodConclusion"),
+    FIRST_RECORD("首次病程录","medFirstRecord"),
+    TRANSFER_IN_NOTE("转入记录", "medTransferInNote"),
+    TRANSFER_OUT_NOTE("转出记录", "medTransferOutNote"),
+    ILL_CRITICALLY("病危通知书", "medIllCritically"),
+    ILL_SERIOUSL("病重通知书", "medIllSeriousl"),
+    DIFFICULT_CASE("疑难病例讨论记录", "medDifficultCase"),
+    DEATH_NOTE("死亡记录", "medDeathNote"),
+    DEATH_DISCUSSION("死亡病例讨论记录", "medDeathDiscussion"),
+    WARD_RECORD("查房记录", "medWardRecord"),
+    OPERATIVE_FIRST_RECORD("术后首次病程及谈话记录", "medOperativeFirstRecord"),
+    PREOPERATIVE_DISCUSSION("术前讨论、术前小结", "medPreoperativeDiscussion"),
+    OPERATIVE_NOTE("手术记录", "medOperativeNote"),
+    RESCUE_NOTE("抢救记录", "medRescueNote"),
+    CRISIS_NOTE("危急值记录", "medCrisisNote"),
+    LEAVE_HOSPITAL("出院小结", "medLeaveHospital"),
+    CONSULTATION_APPLY("会诊申请单", "medConsultationApply"),
+    CONSULTATION_RESULT("会诊结果单", "medConsultationResult"),
+    CONSULTATION_NOTE("会诊单", "medConsultationNote");
+    /*
+    FIRST_RECORD(2, "aMedFirstRecordFacade"),
+    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, "交接班记录"),
+//            (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/ConsoleFacade.java

@@ -2089,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;
     }
 
@@ -2132,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);
@@ -2143,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/MedAdmissionNoteFacade.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -41,4 +41,21 @@ 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 {
+            url="http://192.168.2.186:6010";
+            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/data/ABasDeptInfoFacade.java

@@ -1,13 +1,14 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDeptInfoDTO;
 import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDeptInfoVO;
-import com.diagbot.util.BeanUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -22,6 +23,8 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
     @Autowired
     @Qualifier("basDeptInfoServiceImpl")
     private BasDeptInfoServiceImpl basDeptInfoService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -73,29 +76,30 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
     }
 
     public void execute(List<BasDeptInfo> basDeptInfoList){
-        long startTime=System.currentTimeMillis();
-        List<BasDeptInfo> addE=Lists.newArrayList();
-        List<BasDeptInfo> updateE=Lists.newArrayList();
-        basDeptInfoList.stream().forEach(s -> {
-            BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
-            .eq("dept_id", s.getDeptId())
-            .eq("hospital_id", s.getHospitalId()), false);
-            if (basDeptInfo != null) {
-                s.setGmtModified(new Date());
-                updateE.add(s);
-            } else {
-                s.setGmtCreate(new Date());
-                addE.add(s);
+        try{
+            List<BasDeptInfo> addE=Lists.newArrayList();
+            List<BasDeptInfo> updateE=Lists.newArrayList();
+            basDeptInfoList.stream().forEach(s -> {
+                BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
+                        .eq("dept_id", s.getDeptId())
+                        .eq("hospital_id", s.getHospitalId()), false);
+                if (basDeptInfo != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+            if(updateE.size()>0){
+                basDeptInfoService.updateBatchByKey(updateE);
             }
-        });
-        if(updateE.size()>0){
-            basDeptInfoService.updateBatchByKey(updateE);
-        }
-        if(addE.size()>0){
-            basDeptInfoService.saveBatch(addE);
+            if(addE.size()>0){
+                basDeptInfoService.saveBatch(addE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("科室信息","", JSON.toJSONString(basDeptInfoList),"",e.getMessage());
         }
-
-        long endTime=System.currentTimeMillis();
-        System.out.println("程序运行时间： "+(endTime - startTime)+"ms");
     }
 }

src/main/java/com/diagbot/facade/data/ABasDoctorInfoFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDoctorInfoDTO;
@@ -21,6 +22,8 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Autowired
     @Qualifier("basDoctorInfoServiceImpl")
     private BasDoctorInfoServiceImpl basDoctorInfoService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -68,29 +71,30 @@ public class ABasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     }
 
     public void execute(List<BasDoctorInfo> basDoctorInfoList){
-        long startTime=System.currentTimeMillis();
-        List<BasDoctorInfo> addE=Lists.newArrayList();
-        List<BasDoctorInfo> updateE=Lists.newArrayList();
-        basDoctorInfoList.stream().forEach(s -> {
-            BasDoctorInfo basDoctorInfo =this.baseMapper.selectOne(new QueryWrapper<BasDoctorInfo>()
-                    .eq("doctor_id", s.getDoctorId())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (basDoctorInfo != null) {
-                s.setGmtModified(new Date());
-                updateE.add(s);
-            } else {
-                s.setGmtCreate(new Date());
-                addE.add(s);
+        try {
+            List<BasDoctorInfo> addE=Lists.newArrayList();
+            List<BasDoctorInfo> updateE=Lists.newArrayList();
+            basDoctorInfoList.stream().forEach(s -> {
+                BasDoctorInfo basDoctorInfo =this.baseMapper.selectOne(new QueryWrapper<BasDoctorInfo>()
+                        .eq("doctor_id", s.getDoctorId())
+                        .eq("hospital_id", s.getHospitalId()));
+                if (basDoctorInfo != null) {
+                    s.setGmtModified(new Date());
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    addE.add(s);
+                }
+            });
+            if(updateE.size()>0){
+                basDoctorInfoService.updateBatchByKey(updateE);
             }
-        });
-        if(updateE.size()>0){
-            basDoctorInfoService.updateBatchByKey(updateE);
-        }
-        if(addE.size()>0){
-            basDoctorInfoService.saveBatch(addE);
+            if(addE.size()>0){
+                basDoctorInfoService.saveBatch(addE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息","", JSON.toJSONString(basDoctorInfoList),"",e.getMessage());
         }
-
-        long endTime=System.currentTimeMillis();
-        System.out.println("程序运行时间： "+(endTime - startTime)+"ms");
     }
 }

src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -1,9 +1,13 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
-import com.diagbot.entity.*;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.QcType;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
@@ -13,6 +17,8 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.APlaceFileVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -23,17 +29,15 @@ import java.util.List;
 
 @Component
 public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
-
     @Autowired
     @Qualifier("behospitalInfoServiceImpl")
     private BehospitalInfoServiceImpl behospitalInfoService;
-
     @Autowired
     private QcTypeFacade qcTypeFacade;
-
     @Autowired
     private AMedicalRecordFacade aMedicalRecordFacade;
-
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
     @Autowired
     private QcAbnormalFacade qcAbnormalFacade;
 
@@ -108,30 +112,34 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     }
 
     public void execute(List<BehospitalInfo> behospitalInfoList){
-        List<BehospitalInfo> addE = Lists.newLinkedList();
-        List<BehospitalInfo> updateE = Lists.newLinkedList();
-        behospitalInfoList.stream().forEach(s -> {
-            BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N), false);
-            if (behospitalInfo != null) {
-                s.setGmtModified(new Date());
-                s.setQcTypeId(initQcTypeId(s));
-                updateE.add(s);
-            } else {
-                s.setGmtCreate(new Date());
-                s.setQcTypeId(initQcTypeId(s));
-                addE.add(s);
+        try {
+            List<BehospitalInfo> addE = Lists.newLinkedList();
+            List<BehospitalInfo> updateE = Lists.newLinkedList();
+            behospitalInfoList.stream().forEach(s -> {
+                BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
+                        .eq("behospital_code", s.getBehospitalCode())
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N), false);
+                if (behospitalInfo != null) {
+                    s.setGmtModified(new Date());
+                    s.setQcTypeId(initQcTypeId(s));
+                    updateE.add(s);
+                } else {
+                    s.setGmtCreate(new Date());
+                    s.setQcTypeId(initQcTypeId(s));
+                    addE.add(s);
+                }
+            });
+            if(addE.size()>0){
+                behospitalInfoService.saveBatch(addE);
             }
-        });
-        if(addE.size()>0){
-            behospitalInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            behospitalInfoService.updateBatchByKey(updateE);
+            if(updateE.size()>0){
+                behospitalInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记","", JSON.toJSONString(behospitalInfoList),"",e.getMessage());
         }
-
     }
 
     /**
@@ -148,31 +156,71 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted",IsDeleteEnum.N), false);
         if(medicalRecord!=null){
             QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
-                    .eq("name",medicalRecord.getRecTitle())
-                    .eq("hospital_id", s.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N), false);
-            if(qcType!=null){
+                    .eq("name", medicalRecord.getRecTitle())
+                    .eq("hospital_id", medicalRecord.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N));
+            if(qcType!=null && qcType.getDefaultModule()==0){
                 qcTypeId=qcType.getId();
             }else{
-                //新增类型到qc_type表中
-                QcType qctype=new QcType();
-                qctype.setHospitalId(s.getHospitalId());
-                qctype.setName(medicalRecord.getRecTitle());
-                qctype.setGmtCreate(new Date());
-
-                Long id=qcTypeFacade.saveT(qctype);
-                qcTypeId=id;
-
-                //新增类型到监测表中
-                QcAbnormal qcAbnormal=new QcAbnormal();
-                qcAbnormal.setHospitalId(s.getHospitalId());
-                qcAbnormal.setBehospitalCode(s.getBehospitalCode());
-                qcAbnormal.setType(2);
-                qcAbnormal.setDescription(medicalRecord.getRecTitle());
-                qcAbnormal.setGmtCreate(new Date());
-                qcAbnormalFacade.getBaseMapper().insert(qcAbnormal);
+                QcType qcTypeStand=qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                        .eq("default_module", 1)
+                        .eq("hospital_id", medicalRecord.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N));
+                if(qcTypeStand!=null){
+                    qcTypeId=qcTypeStand.getId();
+                }
             }
         }
         return qcTypeId;
     }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"","删除成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public RespDTO placeFileFlag(APlaceFileVO aPlaceFileVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isBlank(aPlaceFileVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aPlaceFileVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else{
+                UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("behospital_code", aPlaceFileVO.getBehospitalCode())
+                        .eq("hospital_id", aPlaceFileVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_placefile","1")
+                        .set("placefile_date",aPlaceFileVO.getPlaceFileDate().isEmpty()?DateUtil.formatDateTime(DateUtil.now()):DateUtil.parseDateTime(aPlaceFileVO.getPlaceFileDate()))
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new BehospitalInfo(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档","",JSON.toJSONString(aPlaceFileVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
 }

src/main/java/com/diagbot/facade/data/ADataFacade.java

@@ -0,0 +1,4 @@
+package com.diagbot.facade.data;
+
+public class ADataFacade {
+}

src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -1,14 +1,18 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ADoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.ADoctorAdviceVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +28,8 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     @Autowired
     @Qualifier("doctorAdviceServiceImpl")
     private DoctorAdviceServiceImpl doctorAdviceService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -82,28 +88,61 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     }
 
     public void execute(List<DoctorAdvice> doctorAdviceList){
-        List<DoctorAdvice> addE = Lists.newLinkedList();
-        List<DoctorAdvice> updateE = Lists.newLinkedList();
-        if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
-            doctorAdviceList.stream().forEach(s -> {
-                DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
-                        .eq("doctor_advice_id", s.getDoctorAdviceId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code",s.getBehospitalCode()), false);
-                if (doctorAdvice != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            doctorAdviceService.saveBatch(addE);
+        try {
+            List<DoctorAdvice> addE = Lists.newLinkedList();
+            List<DoctorAdvice> updateE = Lists.newLinkedList();
+            if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
+                doctorAdviceList.stream().forEach(s -> {
+                    DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
+                            .eq("doctor_advice_id", s.getDoctorAdviceId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code",s.getBehospitalCode()), false);
+                    if (doctorAdvice != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                doctorAdviceService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                doctorAdviceService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("医嘱信息","", JSON.toJSONString(doctorAdviceList),"",e.getMessage());
         }
-        if(updateE.size()>0){
-            doctorAdviceService.updateBatchByKey(updateE);
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getDoctorAdviceId())) {
+                return RespDTO.onError("请输入病人医嘱编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new DoctorAdvice(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -1,12 +1,18 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeDiagnoseVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +29,9 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     @Qualifier("homeDiagnoseInfoServiceImpl")
     private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -56,30 +65,63 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     }
 
     public void execute(List<HomeDiagnoseInfo> homeDiagnoseList){
-        List<HomeDiagnoseInfo> addE = Lists.newLinkedList();
-        List<HomeDiagnoseInfo> updateE = Lists.newLinkedList();
-        if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
-            homeDiagnoseList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
-                    HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
-                            .eq("home_page_id", s.getHomePageId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
-                    if (diagnoseInfo != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
+        try{
+            List<HomeDiagnoseInfo> addE = Lists.newLinkedList();
+            List<HomeDiagnoseInfo> updateE = Lists.newLinkedList();
+            if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
+                homeDiagnoseList.stream().forEach(s -> {
+                    if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
+                        HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
+                                .eq("home_page_id", s.getHomePageId())
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
+                        if (diagnoseInfo != null) {
+                            s.setGmtModified(new Date());
+                            updateE.add(s);
+                        } else {
+                            s.setGmtCreate(new Date());
+                            addE.add(s);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeDiagnoseInfoService.saveBatch(addE);
+                });
+            }
+            if(addE.size()>0){
+                homeDiagnoseInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeDiagnoseInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-医嘱","", JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
-        if(updateE.size()>0){
-            homeDiagnoseInfoService.updateBatchByKey(updateE);
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("出院诊断未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("出院诊断未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getDiagnoseOrderNo())){
+                return RespDTO.onError("出院诊断未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-诊断-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -1,12 +1,18 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeOperationDTO;
 import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +28,8 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     @Autowired
     @Qualifier("homeOperationInfoServiceImpl")
     private HomeOperationInfoServiceImpl homeOperationInfoService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -58,31 +66,64 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     }
 
     public void execute(List<HomeOperationInfo> homeOperationList){
-        List<HomeOperationInfo> addE = Lists.newLinkedList();
-        List<HomeOperationInfo> updateE = Lists.newLinkedList();
-        if (homeOperationList != null && homeOperationList.size() > 0) {
-            homeOperationList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
-                    QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
-                    if (operationInfo != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
+        try {
+            List<HomeOperationInfo> addE = Lists.newLinkedList();
+            List<HomeOperationInfo> updateE = Lists.newLinkedList();
+            if (homeOperationList != null && homeOperationList.size() > 0) {
+                homeOperationList.stream().forEach(s -> {
+                    if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
+                        QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("home_page_id", s.getHomePageId());
+                        queryWrapper.eq("hospital_id", s.getHospitalId());
+                        queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
+                        HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
+                        if (operationInfo != null) {
+                            s.setGmtModified(new Date());
+                            updateE.add(s);
+                        } else {
+                            s.setGmtCreate(new Date());
+                            addE.add(s);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeOperationInfoService.saveBatch(addE);
+                });
+            }
+            if(addE.size()>0){
+                homeOperationInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeOperationInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术","",JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
-        if(updateE.size()>0){
-            homeOperationInfoService.updateBatchByKey(updateE);
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("住院手术未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("住院手术未输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getOperationOrderNo())){
+                return RespDTO.onError("住院手术未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new HomeOperationInfo(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-手术-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -1,21 +1,18 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
 import com.diagbot.entity.HomePage;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ReadProperties;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.AHomeDiagnoseVO;
-import com.diagbot.vo.data.AHomeOperationVO;
-import com.diagbot.vo.data.AHomePageIngVO;
-import com.diagbot.vo.data.AHomePageVO;
+import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -45,19 +42,10 @@ public class AHomePageFacade extends HomePageServiceImpl{
     @Autowired
     private ReadProperties readProperties;
 
-    private TZDBConn tzDBConn = new TZDBConn();
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
-    /*public static void main(String[] args){
-        int mod=Math.floorMod(5012,500);
-        int div=Math.floorDiv(5012,500);
-        if(mod!=0){
-            div+=1;
-        }
-        System.out.println(mod+"---"+div);
-        for (int i = 0; i < div; i++) {
-            System.out.println((i*500)+"---"+(i+1)*500);
-        }
-    }*/
+    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 同步前一天病案首页
@@ -136,19 +124,24 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @param aHomePageIngVO
      */
     private void updateHomePageIng(AHomePageIngVO aHomePageIngVO){
-        List<HomePage> homePageList=Lists.newArrayList();
-        aHomePageIngVO.getHomePages().stream().forEach(s->{
-            //初始化入参
-            HomePage homePage=new HomePage();
-            BeanUtil.copyProperties(s,homePage);
-            homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-            homePageList.add(homePage);
+        try {
+            List<HomePage> homePageList=Lists.newArrayList();
+            aHomePageIngVO.getHomePages().stream().forEach(s->{
+                //初始化入参
+                HomePage homePage=new HomePage();
+                BeanUtil.copyProperties(s,homePage);
+                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                homePageList.add(homePage);
 
-            //初始化诊断和手术，并同步到数据库
-            aHomeDiagnoseInfoFacade.executeHomeDiagnose(s.getLeaveDiags());//首页诊断
-            aHomeOperationInfoFacade.executeHomeOperation(s.getOperations());//首页手术
-        });
-        execute(homePageList);
+                //初始化诊断和手术，并同步到数据库
+                aHomeDiagnoseInfoFacade.executeHomeDiagnose(s.getLeaveDiags());//首页诊断
+                aHomeOperationInfoFacade.executeHomeOperation(s.getOperations());//首页手术
+            });
+            execute(homePageList);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+        }
     }
 
     /**
@@ -202,7 +195,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
 
     /**
-     * 终末质控-通过接口更新病案首页
+     * 通过接口更新病案首页-不包含医嘱和手术
      * @param list
      * @return
      */
@@ -243,28 +236,60 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @param homePageList
      */
     public void execute(List<HomePage> homePageList){
-        List<HomePage> addE = Lists.newLinkedList();
-        List<HomePage> updateE = Lists.newLinkedList();
-        if (homePageList != null && homePageList.size() > 0) {
-            homePageList.stream().forEach(s -> {
-                HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
-                        .eq("home_page_id", s.getHomePageId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()), false);
-                if (homePage != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            homePageService.saveBatch(addE);
+        try {
+            List<HomePage> addE = Lists.newLinkedList();
+            List<HomePage> updateE = Lists.newLinkedList();
+            if (homePageList != null && homePageList.size() > 0) {
+                homePageList.stream().forEach(s -> {
+                    HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
+                            .eq("home_page_id", s.getHomePageId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode()), false);
+                    if (homePage != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                homePageService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homePageService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(homePageList),"",e.getMessage());
         }
-        if(updateE.size()>0){
-            homePageService.updateBatchByKey(updateE);
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("请输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+                Boolean flag=update(new HomePage(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

src/main/java/com/diagbot/facade/data/AMedAbnormalInfoFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade.data;
+
+import com.diagbot.entity.MedAbnormalInfo;
+import com.diagbot.service.impl.MedAbnormalInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
+    /**
+     * 接口日志记录
+     *
+     * @param paramIn
+     * @param paramOut
+     * @param remark
+     */
+    public void saveAbnormalInfo(String moduleName, String recId, String paramIn, String paramOut, String remark) {
+        MedAbnormalInfo medAbnormalInfo = new MedAbnormalInfo();
+        medAbnormalInfo.setModuleName(moduleName);
+        medAbnormalInfo.setRecId(recId);
+        medAbnormalInfo.setParamIn(paramIn);
+        medAbnormalInfo.setParamOut(paramOut);
+        medAbnormalInfo.setRamark(remark);
+        medAbnormalInfo.setGmtCreate(new Date());
+        this.save(medAbnormalInfo);
+    }
+}

src/main/java/com/diagbot/facade/data/AMedAdmissionNoteFacade.java

@@ -0,0 +1,87 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedAdmissionNote;
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedAdmissionNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh() {
+        List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
+        list.forEach(s -> {
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap = EntityUtil.makeMapWithKeyValue(list, "ch", "en");
+        Boolean flag = columnFacade.createColumn(columnMap, "medAdmissionNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medAdmissionNote");
+        if (!flag) {
+            return;
+        }
+    }
+
+    //入院记录
+    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
+        MedAdmissionNote medAdmissionNote = new MedAdmissionNote();
+        try {
+            AMedAdmissionNoteVO medAdmissionNoteVO = (AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
+            BeanUtils.copyProperties(medAdmissionNoteVO, medAdmissionNote);
+            medAdmissionNote.setHospitalId(hospitalId);//医院编码
+
+            medAdmissionNote.setAuditDate(DateUtil.parseDateTime(medAdmissionNoteVO.getAuditDate()));//审核时间
+            medAdmissionNote.setRecDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecDate()));//记录时间
+            medAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(medAdmissionNoteVO.getBehospitalDate()));//入院日期
+            medAdmissionNote.setBirthday(DateUtil.parseDate(medAdmissionNoteVO.getBirthday()));//出生日期
+            medAdmissionNote.setRecordDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecordDate()));//病历日期
+
+            medAdmissionNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if (isExist(medAdmissionNote)) {
+                medAdmissionNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medAdmissionNote);
+            } else {
+                medAdmissionNote.setGmtModified(new Date());//记录修改时间
+                this.update(medAdmissionNote, new QueryWrapper<MedAdmissionNote>()
+                        .eq("rec_id", medAdmissionNote.getRecId())
+                        .eq("hospital_id", medAdmissionNote.getHospitalId())
+                        .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", medAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
+        }
+    }
+
+    public Boolean isExist(MedAdmissionNote medAdmissionNote) {
+        Boolean flag = true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedAdmissionNote>()
+                .eq("rec_id", medAdmissionNote.getRecId())
+                .eq("hospital_id", medAdmissionNote.getHospitalId())
+                .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
+        if (count > 0) {
+            flag = false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AMedBloodResultFacade.java

@@ -0,0 +1,82 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedBloodResult;
+import com.diagbot.service.impl.MedBloodResultServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedBloodResultVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medBloodResul");
+        if(!flag){
+            return;
+        }
+        //Map<String, String> map=columnFacade.getColumn("medBloodResul");
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedBloodResult medBloodResult=new MedBloodResult();
+        try {
+            AMedBloodResultVO medBloodResultVO=(AMedBloodResultVO) MapUtil.mapToObject(entityMap, AMedBloodResultVO.class);
+            BeanUtils.copyProperties(medBloodResultVO,medBloodResult);
+            medBloodResult.setHospitalId(hospitalId);//医院编码
+            medBloodResult.setAuditDate(DateUtil.parseDateTime(medBloodResultVO.getAuditDate()));//审核时间
+            medBloodResult.setRecDate(DateUtil.parseDateTime(medBloodResultVO.getRecDate()));//记录时间
+            medBloodResult.setRecordDate(DateUtil.parseDateTime(medBloodResultVO.getRecordDate()));//病历日期
+
+            medBloodResult.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medBloodResult)){
+                medBloodResult.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodResult);
+            }else{
+                medBloodResult.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodResult,new QueryWrapper<MedBloodResult>()
+                        .eq("rec_id", medBloodResult.getRecId())
+                        .eq("hospital_id", medBloodResult.getHospitalId())
+                        .eq("behospital_code", medBloodResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",medBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedBloodResult medBloodResult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedBloodResult>()
+                .eq("rec_id", medBloodResult.getRecId())
+                .eq("hospital_id", medBloodResult.getHospitalId())
+                .eq("behospital_code", medBloodResult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedBloodTransfusionFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedBloodTransfusion;
+import com.diagbot.service.impl.MedBloodTransfusionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedBloodTransfusionVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medBloodTransfusion");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
+        try {
+            AMedBloodTransfusionVO medBloodTransfusionVO=(AMedBloodTransfusionVO) MapUtil.mapToObject(entityMap, AMedBloodTransfusionVO.class);
+            BeanUtils.copyProperties(medBloodTransfusionVO,medBloodTransfusion);
+            medBloodTransfusion.setHospitalId(hospitalId);//医院编码
+            medBloodTransfusion.setStartTime(DateUtil.parseDateTime(medBloodTransfusionVO.getStartTime()));
+            medBloodTransfusion.setEndTime(DateUtil.parseDateTime(medBloodTransfusionVO.getEndTime()));
+            medBloodTransfusion.setAuditDate(DateUtil.parseDateTime(medBloodTransfusionVO.getAuditDate()));//审核时间
+            medBloodTransfusion.setRecDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecDate()));//记录时间
+            medBloodTransfusion.setRecordDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecordDate()));//病历日期
+
+            medBloodTransfusion.setWholeData(columnMap);
+
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medBloodTransfusion)){
+                medBloodTransfusion.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodTransfusion);
+            }else{
+                medBloodTransfusion.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodTransfusion,new QueryWrapper<MedBloodTransfusion>()
+                        .eq("rec_id", medBloodTransfusion.getRecId())
+                        .eq("hospital_id", medBloodTransfusion.getHospitalId())
+                        .eq("behospital_code", medBloodTransfusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", medBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedBloodTransfusion medBloodTransfusion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedBloodTransfusion>()
+                .eq("rec_id", medBloodTransfusion.getRecId())
+                .eq("hospital_id", medBloodTransfusion.getHospitalId())
+                .eq("behospital_code", medBloodTransfusion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedConsultationApplyFacade.java

@@ -0,0 +1,89 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedConsultationApply;
+import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedConsultationApplyVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medConsultationApply");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊申请单
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationApply medConsultationApply=new MedConsultationApply();
+        try {
+            AMedConsultationApplyVO medConsultationApplyVO=(AMedConsultationApplyVO) MapUtil.mapToObject(entityMap, AMedConsultationApplyVO.class);
+            BeanUtils.copyProperties(medConsultationApplyVO,medConsultationApply);
+            medConsultationApply.setHospitalId(hospitalId);//医院编码
+
+            medConsultationApply.setAuditDate(DateUtil.parseDateTime(medConsultationApplyVO.getAuditDate()));//审核时间
+            medConsultationApply.setRecDate(DateUtil.parseDateTime(medConsultationApplyVO.getRecDate()));//记录时间
+            medConsultationApply.setBehospitalDate(DateUtil.parseDateTime(medConsultationApplyVO.getBehospitalDate()));//入院日期
+            medConsultationApply.setRecordDate(DateUtil.parseDateTime(medConsultationApplyVO.getRecordDate()));//病历日期
+            medConsultationApply.setApplyDate(DateUtil.parseDateTime(medConsultationApplyVO.getApplyDate()));//申请日期
+            medConsultationApply.setConsultationDate(DateUtil.parseDateTime(medConsultationApplyVO.getConsultationDate()));//会诊时间
+            medConsultationApply.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationApply)){
+                medConsultationApply.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationApply);
+            }else{
+                medConsultationApply.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationApply,new QueryWrapper<MedConsultationApply>()
+                        .eq("rec_id", medConsultationApply.getRecId())
+                        .eq("hospital_id", medConsultationApply.getHospitalId())
+                        .eq("behospital_code", medConsultationApply.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",medConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedConsultationApply medConsultationApply){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationApply>()
+                .eq("rec_id", medConsultationApply.getRecId())
+                .eq("hospital_id", medConsultationApply.getHospitalId())
+                .eq("behospital_code", medConsultationApply.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AMedConsultationNoteFacade.java

@@ -0,0 +1,91 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedConsultationNote;
+import com.diagbot.service.impl.MedConsultationNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedConsultationNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap=EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medConsultationNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊单（申请和结果）
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationNote medConsultationNote=new MedConsultationNote();
+        try {
+            AMedConsultationNoteVO medConsultationNoteVO=(AMedConsultationNoteVO) MapUtil.mapToObject(entityMap, AMedConsultationNoteVO.class);
+            BeanUtils.copyProperties(medConsultationNoteVO,medConsultationNote);
+            medConsultationNote.setHospitalId(hospitalId);//医院编码
+
+            medConsultationNote.setAuditDate(DateUtil.parseDateTime(medConsultationNoteVO.getAuditDate()));//审核时间
+            medConsultationNote.setRecDate(DateUtil.parseDateTime(medConsultationNoteVO.getRecDate()));//记录时间
+            medConsultationNote.setBehospitalDate(DateUtil.parseDateTime(medConsultationNoteVO.getBehospitalDate()));//入院日期
+            medConsultationNote.setApplyDate(DateUtil.parseDate(medConsultationNoteVO.getApplyDate()));//申请日期
+            medConsultationNote.setRecordDate(DateUtil.parseDateTime(medConsultationNoteVO.getRecordDate()));//病历日期
+            medConsultationNote.setConsultationDate(DateUtil.parseDateTime(medConsultationNoteVO.getConsultationDate()));//会诊时间
+
+            medConsultationNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationNote)){
+                medConsultationNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationNote);
+            }else{
+                medConsultationNote.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationNote,new QueryWrapper<MedConsultationNote>()
+                        .eq("rec_id", medConsultationNote.getRecId())
+                        .eq("hospital_id", medConsultationNote.getHospitalId())
+                        .eq("behospital_code", medConsultationNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",medConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedConsultationNote medConsultationNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationNote>()
+                .eq("rec_id", medConsultationNote.getRecId())
+                .eq("hospital_id", medConsultationNote.getHospitalId())
+                .eq("behospital_code", medConsultationNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AMedConsultationResultFacade.java

@@ -0,0 +1,90 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedConsultationResult;
+import com.diagbot.service.impl.MedConsultationResultServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedConsultationResultVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedConsultationResultFacade extends MedConsultationResultServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medConsultationResult");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊结果单
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedConsultationResult medConsultationResult=new MedConsultationResult();
+        try {
+            AMedConsultationResultVO medConsultationResultVO=(AMedConsultationResultVO) MapUtil.mapToObject(entityMap, AMedConsultationResultVO.class);
+            BeanUtils.copyProperties(medConsultationResultVO,medConsultationResult);
+            medConsultationResult.setHospitalId(hospitalId);//医院编码
+
+            medConsultationResult.setAuditDate(DateUtil.parseDateTime(medConsultationResultVO.getAuditDate()));//审核时间
+            medConsultationResult.setRecDate(DateUtil.parseDateTime(medConsultationResultVO.getRecDate()));//记录时间
+            medConsultationResult.setBehospitalDate(DateUtil.parseDateTime(medConsultationResultVO.getBehospitalDate()));//入院日期
+            medConsultationResult.setApplyDate(DateUtil.parseDate(medConsultationResultVO.getApplyDate()));//申请时间
+            medConsultationResult.setRecordDate(DateUtil.parseDateTime(medConsultationResultVO.getRecordDate()));//病历日期
+            medConsultationResult.setConsultationArriveDate(DateUtil.parseDateTime(medConsultationResultVO.getConsultationArriveDate()));//会诊到达时间
+
+            medConsultationResult.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medConsultationResult)){
+                medConsultationResult.setGmtCreate(new Date());//记录创建时间
+                this.save(medConsultationResult);
+            }else{
+                medConsultationResult.setGmtModified(new Date());//记录修改时间
+                this.update(medConsultationResult,new QueryWrapper<MedConsultationResult>()
+                        .eq("rec_id", medConsultationResult.getRecId())
+                        .eq("hospital_id", medConsultationResult.getHospitalId())
+                        .eq("behospital_code", medConsultationResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",medConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedConsultationResult medConsultationResult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationResult>()
+                .eq("rec_id", medConsultationResult.getRecId())
+                .eq("hospital_id", medConsultationResult.getHospitalId())
+                .eq("behospital_code", medConsultationResult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedCrisisDTO;
@@ -17,67 +18,74 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
+public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
 
     @Autowired
     @Qualifier("medCrisisInfoServiceImpl")
     private MedCrisisInfoServiceImpl medCrisisInfoService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             //循环验证数据有效性
-            for (AMedCrisisVO aMedCrisisVO:list) {
-                if("".equals(aMedCrisisVO.getRecId())){
+            for (AMedCrisisVO aMedCrisisVO : list) {
+                if ("".equals(aMedCrisisVO.getRecId())) {
                     return RespDTO.onError("请输入文书编码!");
-                }else if("".equals(aMedCrisisVO.getBehospitalCode())) {
+                } else if ("".equals(aMedCrisisVO.getBehospitalCode())) {
                     return RespDTO.onError("请输入病人住院编码!");
-                }else if(aMedCrisisVO.getHospitalId()==null){
+                } else if (aMedCrisisVO.getHospitalId() == null) {
                     return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aMedCrisisVO.getRecType())){
+                } else if ("".equals(aMedCrisisVO.getRecType())) {
                     return RespDTO.onError("请输入危急值类型!");
                 }
             }
 
-            List<MedCrisisInfo> medCrisisList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                MedCrisisInfo medCrisisInfo=new MedCrisisInfo();
-                BeanUtil.copyProperties(s,medCrisisInfo);
+            List<MedCrisisInfo> medCrisisList = Lists.newArrayList();
+            list.stream().forEach(s -> {
+                MedCrisisInfo medCrisisInfo = new MedCrisisInfo();
+                BeanUtil.copyProperties(s, medCrisisInfo);
                 medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
                 medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
                 medCrisisList.add(medCrisisInfo);
             });
             execute(medCrisisList);
 
-            List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
+            List<AMedCrisisDTO> medCrisisDtoList = BeanUtil.listCopyTo(list, AMedCrisisDTO.class);
             return RespDTO.onSuc(medCrisisDtoList);
-        }else{
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
     }
 
-    public void execute(List<MedCrisisInfo> medCrisisList){
+    public void execute(List<MedCrisisInfo> medCrisisList) {
         List<MedCrisisInfo> addE = Lists.newLinkedList();
         List<MedCrisisInfo> updateE = Lists.newLinkedList();
         if (medCrisisList != null && medCrisisList.size() > 0) {
-            medCrisisList.stream().forEach(s -> {
-                MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
-                .eq("rec_id", s.getRecId())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("rec_type", s.getRecType()), false);
-                if (medCrisisInfo != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
+            medCrisisList.forEach(s -> {
+                try {
+                    MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
+                            .eq("rec_id", s.getRecId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode())
+                            .eq("rec_type", s.getRecType()), false);
+                    if (medCrisisInfo != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                    aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析", s.getRecId(), JSON.toJSONString(medCrisisList), "", e.getMessage());
                 }
             });
         }
-        if(addE.size()>0){
+        if (addE.size() > 0) {
             medCrisisInfoService.saveBatch(addE);
         }
-        if(updateE.size()>0){
+        if (updateE.size() > 0) {
             medCrisisInfoService.updateBatchByKey(updateE);
         }
     }

src/main/java/com/diagbot/facade/data/AMedCrisisNoteFacade.java

@@ -0,0 +1,85 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedCrisisNote;
+import com.diagbot.service.impl.MedCrisisNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedCrisisNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medCrisisNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedCrisisNote medCrisisNote=new MedCrisisNote();
+        try {
+            AMedCrisisNoteVO medCrisisNoteVO=(AMedCrisisNoteVO) MapUtil.mapToObject(entityMap, AMedCrisisNoteVO.class);
+            BeanUtils.copyProperties(medCrisisNoteVO,medCrisisNote);
+            medCrisisNote.setHospitalId(hospitalId);//医院编码
+
+            medCrisisNote.setAuditDate(DateUtil.parseDateTime(medCrisisNoteVO.getAuditDate()));//审核时间
+            medCrisisNote.setRecDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecDate()));//记录时间
+            medCrisisNote.setRecieveDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecieveDate()));//开始时间
+            medCrisisNote.setAuditDate(DateUtil.parseDate(medCrisisNoteVO.getAuditDate()));//结束时间
+            medCrisisNote.setRecordDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecordDate()));//病历日期
+
+            medCrisisNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medCrisisNote)){
+                medCrisisNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medCrisisNote);
+            }else{
+                medCrisisNote.setGmtModified(new Date());//记录修改时间
+                this.update(medCrisisNote,new QueryWrapper<MedCrisisNote>()
+                        .eq("rec_id", medCrisisNote.getRecId())
+                        .eq("hospital_id", medCrisisNote.getHospitalId())
+                        .eq("behospital_code", medCrisisNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",medCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedCrisisNote medCrisisNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedCrisisNote>()
+                .eq("rec_id", medCrisisNote.getRecId())
+                .eq("hospital_id", medCrisisNote.getHospitalId())
+                .eq("behospital_code", medCrisisNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedDeathDiscussionFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedDeathDiscussion;
+import com.diagbot.service.impl.MedDeathDiscussionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedDeathDiscussionVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medDeathDiscussion");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //死亡病例讨论记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
+        try {
+            AMedDeathDiscussionVO medDeathDiscussionVO=(AMedDeathDiscussionVO) MapUtil.mapToObject(entityMap, AMedDeathDiscussionVO.class);
+            BeanUtils.copyProperties(medDeathDiscussionVO,medDeathDiscussion);
+            medDeathDiscussion.setHospitalId(hospitalId);//医院编码
+
+            medDeathDiscussion.setAuditDate(DateUtil.parseDateTime(medDeathDiscussionVO.getAuditDate()));//审核时间
+            medDeathDiscussion.setRecDate(DateUtil.parseDateTime(medDeathDiscussionVO.getRecDate()));//记录时间
+            medDeathDiscussion.setDeathDate(DateUtil.parseDateTime(medDeathDiscussionVO.getDeathDate()));//死亡时间
+            medDeathDiscussion.setDiscussDate(DateUtil.parseDate(medDeathDiscussionVO.getDiscussDate()));//讨论时间
+            medDeathDiscussion.setRecordDate(DateUtil.parseDateTime(medDeathDiscussionVO.getRecordDate()));//病历日期
+
+            medDeathDiscussion.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathDiscussion)){
+                medDeathDiscussion.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathDiscussion);
+            }else{
+                medDeathDiscussion.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathDiscussion,new QueryWrapper<MedDeathDiscussion>()
+                        .eq("rec_id", medDeathDiscussion.getRecId())
+                        .eq("hospital_id", medDeathDiscussion.getHospitalId())
+                        .eq("behospital_code", medDeathDiscussion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",medDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedDeathDiscussion medDeathDiscussion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedDeathDiscussion>()
+                .eq("rec_id", medDeathDiscussion.getRecId())
+                .eq("hospital_id", medDeathDiscussion.getHospitalId())
+                .eq("behospital_code", medDeathDiscussion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedDeathNoteFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedDeathNote;
+import com.diagbot.service.impl.MedDeathNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedDeathNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medDeathNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //死亡记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDeathNote medDeathNote=new MedDeathNote();
+        try {
+            AMedDeathNoteVO medDeathNoteVO=(AMedDeathNoteVO) MapUtil.mapToObject(entityMap, AMedDeathNoteVO.class);
+            BeanUtils.copyProperties(medDeathNoteVO,medDeathNote);
+            medDeathNote.setHospitalId(hospitalId);//医院编码
+
+            medDeathNote.setAuditDate(DateUtil.parseDateTime(medDeathNoteVO.getAuditDate()));//审核时间
+            medDeathNote.setRecDate(DateUtil.parseDateTime(medDeathNoteVO.getRecDate()));//记录时间
+            medDeathNote.setBehospitalDate(DateUtil.parseDateTime(medDeathNoteVO.getBehospitalDate()));//入院日期
+            medDeathNote.setDeathDate(DateUtil.parseDate(medDeathNoteVO.getDeathDate()));//死亡日期
+            medDeathNote.setRecordDate(DateUtil.parseDateTime(medDeathNoteVO.getRecordDate()));//病历日期
+
+            medDeathNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDeathNote)){
+                medDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medDeathNote);
+            }else{
+                medDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(medDeathNote,new QueryWrapper<MedDeathNote>()
+                        .eq("rec_id", medDeathNote.getRecId())
+                        .eq("hospital_id", medDeathNote.getHospitalId())
+                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", medDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedDeathNote medDeathNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedDeathNote>()
+                .eq("rec_id", medDeathNote.getRecId())
+                .eq("hospital_id", medDeathNote.getHospitalId())
+                .eq("behospital_code", medDeathNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedDifficultCaseFacade.java

@@ -0,0 +1,85 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedDifficultCase;
+import com.diagbot.service.impl.MedDifficultCaseServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedDifficultCaseVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medDifficultCase");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedDifficultCase medDifficult=new MedDifficultCase();
+        try {
+            AMedDifficultCaseVO medDifficultVO=(AMedDifficultCaseVO) MapUtil.mapToObject(entityMap, AMedDifficultCaseVO.class);
+            BeanUtils.copyProperties(medDifficultVO,medDifficult);
+            medDifficult.setHospitalId(hospitalId);//医院编码
+            medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
+            medDifficult.setAuditDate(DateUtil.parseDateTime(medDifficultVO.getAuditDate()));
+            medDifficult.setDiscussDate(DateUtil.parseDateTime(medDifficultVO.getDiscussDate()));
+            medDifficult.setRecordDate(DateUtil.parseDateTime(medDifficultVO.getRecordDate()));//病历日期
+
+            medDifficult.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medDifficult)){
+                medDifficult.setGmtCreate(new Date());//记录创建时间
+                this.save(medDifficult);
+            }else{
+                medDifficult.setGmtModified(new Date());//记录修改时间
+                this.update(medDifficult,new QueryWrapper<MedDifficultCase>()
+                        .eq("rec_id", medDifficult.getRecId())
+                        .eq("hospital_id", medDifficult.getHospitalId())
+                        .eq("behospital_code", medDifficult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("疑难病例讨论记录",medDifficult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedDifficultCase medDifficult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedDifficultCase>()
+                .eq("rec_id", medDifficult.getRecId())
+                .eq("hospital_id", medDifficult.getHospitalId())
+                .eq("behospital_code", medDifficult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedFirstRecordFacade.java

@@ -0,0 +1,86 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedFirstRecord;
+import com.diagbot.service.impl.MedFirstRecordServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedFirstRecordVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medFirstRecord");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedFirstRecord medFirstRecord=new MedFirstRecord();
+        try {
+            AMedFirstRecordVO medFirstRecordVO=(AMedFirstRecordVO) MapUtil.mapToObject(entityMap, AMedFirstRecordVO.class);
+            BeanUtils.copyProperties(medFirstRecordVO,medFirstRecord);
+            medFirstRecord.setHospitalId(hospitalId);//医院编码
+
+            medFirstRecord.setAuditDate(DateUtil.parseDateTime(medFirstRecordVO.getAuditDate()));//审核时间
+            medFirstRecord.setRecDate(DateUtil.parseDateTime(medFirstRecordVO.getRecDate()));//记录时间
+            medFirstRecord.setRecordDate(DateUtil.parseDateTime(medFirstRecordVO.getRecordDate()));//病历日期
+
+            medFirstRecord.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medFirstRecord)){
+                medFirstRecord.setGmtCreate(new Date());//记录创建时间
+                this.save(medFirstRecord);
+            }else{
+                medFirstRecord.setGmtModified(new Date());//记录修改时间
+                this.update(medFirstRecord,new QueryWrapper<MedFirstRecord>()
+                        .eq("rec_id", medFirstRecord.getRecId())
+                        .eq("hospital_id", medFirstRecord.getHospitalId())
+                        .eq("behospital_code", medFirstRecord.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("首次病程录", medFirstRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedFirstRecord medFirstRecord){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedFirstRecord>()
+                .eq("rec_id", medFirstRecord.getRecId())
+                .eq("hospital_id", medFirstRecord.getHospitalId())
+                .eq("behospital_code", medFirstRecord.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedIllCriticallyFacade.java

@@ -0,0 +1,85 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedIllCritically;
+import com.diagbot.service.impl.MedIllCriticallyServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedIllCriticallyVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medIllCritically");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedIllCritically medIllCritically=new MedIllCritically();
+        try {
+            AMedIllCriticallyVO medIllCriticallyVO=(AMedIllCriticallyVO) MapUtil.mapToObject(entityMap, AMedIllCriticallyVO.class);
+            BeanUtils.copyProperties(medIllCriticallyVO,medIllCritically);
+            medIllCritically.setHospitalId(hospitalId);//医院编码
+            medIllCritically.setPatientSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getPatientSignDate()));
+            medIllCritically.setDoctorSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getDoctorSignDate()));//审核时间
+            medIllCritically.setRecordDate(DateUtil.parseDateTime(medIllCriticallyVO.getRecordDate()));//病历日期
+
+            medIllCritically.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medIllCritically)){
+                medIllCritically.setGmtCreate(new Date());//记录创建时间
+                this.save(medIllCritically);
+            }else{
+                medIllCritically.setGmtModified(new Date());//记录修改时间
+                this.update(medIllCritically,new QueryWrapper<MedIllCritically>()
+                        .eq("rec_id", medIllCritically.getRecId())
+                        .eq("hospital_id", medIllCritically.getHospitalId())
+                        .eq("behospital_code", medIllCritically.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单",medIllCritically.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedIllCritically MedIllCritically){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedIllCritically>()
+                .eq("rec_id", MedIllCritically.getRecId())
+                .eq("hospital_id", MedIllCritically.getHospitalId())
+                .eq("behospital_code", MedIllCritically.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacade.java

@@ -0,0 +1,85 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedIllSeriousl;
+import com.diagbot.service.impl.MedIllSeriouslServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedIllSeriouslVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medIllSeriousl");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
+        try {
+            AMedIllSeriouslVO medIllSeriouslVO=(AMedIllSeriouslVO) MapUtil.mapToObject(entityMap, AMedIllSeriouslVO.class);
+            BeanUtils.copyProperties(medIllSeriouslVO,medIllSeriousl);
+            medIllSeriousl.setHospitalId(hospitalId);//医院编码
+            medIllSeriousl.setPatientSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getPatientSignDate()));
+            medIllSeriousl.setDoctorSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getDoctorSignDate()));//审核时间
+            medIllSeriousl.setRecordDate(DateUtil.parseDateTime(medIllSeriouslVO.getRecordDate()));//病历日期
+
+            medIllSeriousl.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medIllSeriousl)){
+                medIllSeriousl.setGmtCreate(new Date());//记录创建时间
+                this.save(medIllSeriousl);
+            }else{
+                medIllSeriousl.setGmtModified(new Date());//记录修改时间
+                this.update(medIllSeriousl,new QueryWrapper<MedIllSeriousl>()
+                        .eq("rec_id", medIllSeriousl.getRecId())
+                        .eq("hospital_id", medIllSeriousl.getHospitalId())
+                        .eq("behospital_code", medIllSeriousl.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", medIllSeriousl.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedIllSeriousl medIllSeriousl){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedIllSeriousl>()
+                .eq("rec_id", medIllSeriousl.getRecId())
+                .eq("hospital_id", medIllSeriousl.getHospitalId())
+                .eq("behospital_code", medIllSeriousl.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedLeaveHospitalFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedLeaveHospital;
+import com.diagbot.service.impl.MedLeaveHospitalServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedLeaveHospitalVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medLeaveHospital");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //危急值记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
+        try {
+            AMedLeaveHospitalVO medLeaveHospitalVO=(AMedLeaveHospitalVO) MapUtil.mapToObject(entityMap, AMedLeaveHospitalVO.class);
+            BeanUtils.copyProperties(medLeaveHospitalVO,medLeaveHospital);
+            medLeaveHospital.setHospitalId(hospitalId);//医院编码
+
+            medLeaveHospital.setAuditDate(DateUtil.parseDateTime(medLeaveHospitalVO.getAuditDate()));//审核时间
+            medLeaveHospital.setRecDate(DateUtil.parseDateTime(medLeaveHospitalVO.getRecDate()));//记录时间
+            medLeaveHospital.setBehospitalDate(DateUtil.parseDateTime(medLeaveHospitalVO.getBehospitalDate()));//入院日期
+            medLeaveHospital.setLeaveHospitalDate(DateUtil.parseDateTime(medLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
+            medLeaveHospital.setRecordDate(DateUtil.parseDateTime(medLeaveHospitalVO.getRecordDate()));//病历日期
+
+            medLeaveHospital.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medLeaveHospital)){
+                medLeaveHospital.setGmtCreate(new Date());//记录创建时间
+                this.save(medLeaveHospital);
+            }else{
+                medLeaveHospital.setGmtModified(new Date());//记录修改时间
+                this.update(medLeaveHospital,new QueryWrapper<MedLeaveHospital>()
+                        .eq("rec_id", medLeaveHospital.getRecId())
+                        .eq("hospital_id", medLeaveHospital.getHospitalId())
+                        .eq("behospital_code", medLeaveHospital.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结",medLeaveHospital.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedLeaveHospital medLeaveHospital){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedLeaveHospital>()
+                .eq("rec_id", medLeaveHospital.getRecId())
+                .eq("hospital_id", medLeaveHospital.getHospitalId())
+                .eq("behospital_code", medLeaveHospital.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedLisResultFacade.java

@@ -0,0 +1,128 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedLisResult;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedLisResultServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedLisResultVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedLisResultFacade extends MedLisResultServiceImpl {
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    private TZDBConn tzDBConn = new TZDBConn();
+
+    /**
+     * 同步前一天
+     */
+    public void executeMedLisResult() {
+        //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        //同步前一天的数据
+        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        List<MedLisResult> medLisResultList= tzDBConn.getLisResult(sql);
+        execute(medLisResultList);
+    }
+
+    public RespDTO<List<AMedLisResultVO>> executeMedLisResult(List<AMedLisResultVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedLisResultVO aMedLisResultVO:list) {
+                    if(StringUtil.isEmpty(aMedLisResultVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedLisResultVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedLisResultVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedLisResult> medLisResultList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedLisResult medLisResult=new MedLisResult();
+                    BeanUtil.copyProperties(s,medLisResult);
+                    medLisResultList.add(medLisResult);
+                });
+                execute(medLisResultList);
+
+                return RespDTO.onSuc(list);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public void execute(List<MedLisResult> medLisResultList){
+        try {
+            List<MedLisResult> addE = Lists.newLinkedList();
+            List<MedLisResult> updateE = Lists.newLinkedList();
+            if (medLisResultList != null && medLisResultList.size() > 0) {
+                medLisResultList.stream().forEach(s -> {
+                    MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
+                            .eq("rep_no", s.getRepNo())
+                            .eq("hospital_id", s.getHospitalId()), false);
+                    if (medLisResult != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                this.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                this.baseMapper.updateBatchByKey(updateE);
+            }
+            //aMedAbnormalInfoFacade.saveAbnormalInfo("检验",JSON.toJSONString(medLisResultList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验","",JSON.toJSONString(medLisResultList),"",e.getMessage());
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedLisResult> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedLisResult(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检验-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检验-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

src/main/java/com/diagbot/facade/data/AMedOperativeFirstRecord.java

@@ -0,0 +1,90 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedOperativeFirstRecord;
+import com.diagbot.service.impl.MedOperativeFirstRecordServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedOperativeFirstRecordVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medOperativeFirstRecord");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //术后首程
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
+        try {
+            AMedOperativeFirstRecordVO medOperativeFirstRecordVO=(AMedOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AMedOperativeFirstRecordVO.class);
+            BeanUtils.copyProperties(medOperativeFirstRecordVO,medOperativeFirstRecord);
+            medOperativeFirstRecord.setHospitalId(hospitalId);//医院编码
+
+            medOperativeFirstRecord.setAuditDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getAuditDate()));//审核时间
+            medOperativeFirstRecord.setRecDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getRecDate()));//记录时间
+            medOperativeFirstRecord.setOperationDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getOperationDate()));//手术日期
+            medOperativeFirstRecord.setStartTime(DateUtil.parseDate(medOperativeFirstRecordVO.getStartTime()));//开始时间
+            medOperativeFirstRecord.setEndTime(DateUtil.parseDate(medOperativeFirstRecordVO.getEndTime()));//结束时间
+            medOperativeFirstRecord.setRecordDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getRecordDate()));//病历日期
+
+            medOperativeFirstRecord.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medOperativeFirstRecord)){
+                medOperativeFirstRecord.setGmtCreate(new Date());//记录创建时间
+                this.save(medOperativeFirstRecord);
+            }else{
+                medOperativeFirstRecord.setGmtModified(new Date());//记录修改时间
+                this.update(medOperativeFirstRecord,new QueryWrapper<MedOperativeFirstRecord>()
+                        .eq("rec_id", medOperativeFirstRecord.getRecId())
+                        .eq("hospital_id", medOperativeFirstRecord.getHospitalId())
+                        .eq("behospital_code", medOperativeFirstRecord.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程",medOperativeFirstRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedOperativeFirstRecord medOperativeFirstRecord){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedOperativeFirstRecord>()
+                .eq("rec_id", medOperativeFirstRecord.getRecId())
+                .eq("hospital_id", medOperativeFirstRecord.getHospitalId())
+                .eq("behospital_code", medOperativeFirstRecord.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedOperativeNoteFacade.java

@@ -0,0 +1,89 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedOperativeNote;
+import com.diagbot.service.impl.MedOperativeNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedOperativeNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medOperativeNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //手术记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedOperativeNote medOperativeNote=new MedOperativeNote();
+        try {
+            AMedOperativeNoteVO medOperativeNoteVO=(AMedOperativeNoteVO) MapUtil.mapToObject(entityMap, AMedOperativeNoteVO.class);
+            BeanUtils.copyProperties(medOperativeNoteVO,medOperativeNote);
+            medOperativeNote.setHospitalId(hospitalId);//医院编码
+
+            medOperativeNote.setAuditDate(DateUtil.parseDateTime(medOperativeNoteVO.getAuditDate()));//审核时间
+            medOperativeNote.setRecDate(DateUtil.parseDateTime(medOperativeNoteVO.getRecDate()));//记录时间
+            medOperativeNote.setOperationDate(DateUtil.parseDateTime(medOperativeNoteVO.getOperationDate()));//手术日期
+            medOperativeNote.setStartTime(DateUtil.parseDate(medOperativeNoteVO.getStartTime()));//开始时间
+            medOperativeNote.setEndTime(DateUtil.parseDate(medOperativeNoteVO.getEndTime()));//结束时间
+            medOperativeNote.setRecordDate(DateUtil.parseDateTime(medOperativeNoteVO.getRecordDate()));//病历日期
+
+            medOperativeNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medOperativeNote)){
+                medOperativeNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medOperativeNote);
+            }else{
+                medOperativeNote.setGmtModified(new Date());//记录修改时间
+                this.update(medOperativeNote,new QueryWrapper<MedOperativeNote>()
+                        .eq("rec_id", medOperativeNote.getRecId())
+                        .eq("hospital_id", medOperativeNote.getHospitalId())
+                        .eq("behospital_code", medOperativeNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", medOperativeNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedOperativeNote medOperativeNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedOperativeNote>()
+                .eq("rec_id", medOperativeNote.getRecId())
+                .eq("hospital_id", medOperativeNote.getHospitalId())
+                .eq("behospital_code", medOperativeNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedPacsResultFacade.java

@@ -0,0 +1,128 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedPacsResult;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedPacsResultServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.AMedPacsResultVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    private TZDBConn tzDBConn = new TZDBConn();
+
+    /**
+     * 同步前一天
+     */
+    public void executeMedPacsResult() {
+        //String sql="select * from br_rechome where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        //同步前一天的数据
+        String sql="select * from br_rechome where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
+        List<MedPacsResult> medPacsResultList= tzDBConn.getPacsResult(sql);
+        execute(medPacsResultList);
+    }
+
+    public RespDTO<List<AMedPacsResultVO>> executeMedPacsResult(List<AMedPacsResultVO> list) {
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedPacsResultVO aMedPacsResultVO:list) {
+                    if(StringUtil.isEmpty(aMedPacsResultVO.getRepNo())){
+                        return RespDTO.onError("请输入报告单号!");
+                    }else if(aMedPacsResultVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if(StringUtil.isEmpty(aMedPacsResultVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
+                }
+
+                List<MedPacsResult> medPacsResultList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedPacsResult medPacsResult=new MedPacsResult();
+                    BeanUtil.copyProperties(s,medPacsResult);
+                    medPacsResultList.add(medPacsResult);
+                });
+                execute(medPacsResultList);
+
+                return RespDTO.onSuc(list);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+
+    public void execute(List<MedPacsResult> medPacsResultList){
+        try {
+            List<MedPacsResult> addE = Lists.newLinkedList();
+            List<MedPacsResult> updateE = Lists.newLinkedList();
+            if (medPacsResultList != null && medPacsResultList.size() > 0) {
+                medPacsResultList.stream().forEach(s -> {
+                    MedPacsResult medPacsResult = this.getOne(new QueryWrapper<MedPacsResult>()
+                            .eq("rep_no", s.getRepNo())
+                            .eq("hospital_id", s.getHospitalId()), false);
+                    if (medPacsResult != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                this.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                this.baseMapper.updateBatchByKey(updateE);
+            }
+            //aMedAbnormalInfoFacade.saveAbnormalInfo("检查",JSON.toJSONString(medPacsResultList),"","操作成功!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查","",JSON.toJSONString(medPacsResultList),"",e.getMessage());
+        }
+    }
+
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+        try {
+            //验证数据是否存在
+            if(StringUtil.isEmpty(aDeleteFlagVO.getReptNo())){
+                return RespDTO.onError("请输入报告单号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedPacsResult> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rep_no", aDeleteFlagVO.getReptNo())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+
+                Boolean flag=update(new MedPacsResult(),updateWrapper);
+                //aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo("检查-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
+        }
+    }
+}

src/main/java/com/diagbot/facade/data/AMedPeriodConclusionFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedPeriodConclusion;
+import com.diagbot.service.impl.MedPeriodConclusionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedAdmissionNoteVO;
+import com.diagbot.vo.data.AMedPeriodConclusionVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medPeriodConclusion");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
+        try {
+            AMedPeriodConclusionVO medPeriodConclusionVO=(AMedPeriodConclusionVO) MapUtil.mapToObject(entityMap, AMedPeriodConclusionVO.class);
+            BeanUtils.copyProperties(medPeriodConclusionVO,medPeriodConclusion);
+            medPeriodConclusion.setHospitalId(hospitalId);//医院编码
+
+            medPeriodConclusion.setAuditDate(DateUtil.parseDateTime(medPeriodConclusionVO.getAuditDate()));//审核时间
+            medPeriodConclusion.setRecDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecDate()));//记录时间
+            medPeriodConclusion.setRecordDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecordDate()));//病历日期
+
+            medPeriodConclusion.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medPeriodConclusion)){
+                medPeriodConclusion.setGmtCreate(new Date());//记录创建时间
+                this.save(medPeriodConclusion);
+            }else{
+                medPeriodConclusion.setGmtModified(new Date());//记录修改时间
+                this.update(medPeriodConclusion,new QueryWrapper<MedPeriodConclusion>()
+                        .eq("rec_id", medPeriodConclusion.getRecId())
+                        .eq("hospital_id", medPeriodConclusion.getHospitalId())
+                        .eq("behospital_code", medPeriodConclusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结",medPeriodConclusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedPeriodConclusion medPeriodConclusion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedPeriodConclusion>()
+                .eq("rec_id", medPeriodConclusion.getRecId())
+                .eq("hospital_id", medPeriodConclusion.getHospitalId())
+                .eq("behospital_code", medPeriodConclusion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AMedPreoperativeDiscussionFacade.java

@@ -0,0 +1,87 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedPreoperativeDiscussion;
+import com.diagbot.service.impl.MedPreoperativeDiscussionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedPreoperativeDiscussionVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medPreoperativeDiscussion");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //入院记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
+        try {
+            AMedPreoperativeDiscussionVO medPreoperativeDiscussionVO=(AMedPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AMedPreoperativeDiscussionVO.class);
+            BeanUtils.copyProperties(medPreoperativeDiscussionVO,medPreoperativeDiscussion);
+            medPreoperativeDiscussion.setHospitalId(hospitalId);//医院编码
+
+            medPreoperativeDiscussion.setAuditDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getAuditDate()));//审核时间
+            medPreoperativeDiscussion.setRecDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getRecDate()));//记录时间
+            medPreoperativeDiscussion.setDiscussTime(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getDiscussTime()));//讨论时间
+            medPreoperativeDiscussion.setRecordDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getRecordDate()));//病历日期
+
+            medPreoperativeDiscussion.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medPreoperativeDiscussion)){
+                medPreoperativeDiscussion.setGmtCreate(new Date());//记录创建时间
+                this.save(medPreoperativeDiscussion);
+            }else{
+                medPreoperativeDiscussion.setGmtModified(new Date());//记录修改时间
+                this.update(medPreoperativeDiscussion,new QueryWrapper<MedPreoperativeDiscussion>()
+                        .eq("rec_id", medPreoperativeDiscussion.getRecId())
+                        .eq("hospital_id", medPreoperativeDiscussion.getHospitalId())
+                        .eq("behospital_code", medPreoperativeDiscussion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结",medPreoperativeDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedPreoperativeDiscussion medPreoperativeDiscussion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedPreoperativeDiscussion>()
+                .eq("rec_id", medPreoperativeDiscussion.getRecId())
+                .eq("hospital_id", medPreoperativeDiscussion.getHospitalId())
+                .eq("behospital_code", medPreoperativeDiscussion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordTypeDTO;
@@ -23,6 +24,8 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
     @Autowired
     @Qualifier("medRecordTypeServiceImpl")
     private MedRecordTypeServiceImpl medRecordTypeService;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     private TZDBConn tzDBConn = new TZDBConn();
 
@@ -64,28 +67,34 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
     }
 
     public void execute(List<MedRecordType> medRecordTypeList){
-        List<MedRecordType> addE = Lists.newLinkedList();
-        List<MedRecordType> updateE = Lists.newLinkedList();
-        if (medRecordTypeList != null && medRecordTypeList.size() != 0) {
-            medRecordTypeList.stream().forEach(s -> {
-                MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
-                        .eq("type_id", s.getTypeId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N), false);
-                if (mrType != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medRecordTypeService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medRecordTypeService.updateBatchByKey(updateE);
+        try {
+            List<MedRecordType> addE = Lists.newLinkedList();
+            List<MedRecordType> updateE = Lists.newLinkedList();
+            if (medRecordTypeList != null && medRecordTypeList.size() != 0) {
+                medRecordTypeList.stream().forEach(s -> {
+                    MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
+                            .eq("type_id", s.getTypeId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("is_deleted",IsDeleteEnum.N), false);
+                    if (mrType != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medRecordTypeService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medRecordTypeService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("文书类别","", JSON.toJSONString(medRecordTypeList),"",e.getMessage());
         }
+
     }
 }

src/main/java/com/diagbot/facade/data/AMedRescueNoteFacade.java

@@ -0,0 +1,87 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedRescueNote;
+import com.diagbot.service.impl.MedRescueNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedRescueNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medRescueNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedRescueNote medRescueNote=new MedRescueNote();
+        try {
+            AMedRescueNoteVO medRescueNoteVO=(AMedRescueNoteVO) MapUtil.mapToObject(entityMap, AMedRescueNoteVO.class);
+            BeanUtils.copyProperties(medRescueNoteVO,medRescueNote);
+            medRescueNote.setHospitalId(hospitalId);//医院编码
+
+            medRescueNote.setAuditDate(DateUtil.parseDateTime(medRescueNoteVO.getAuditDate()));//审核时间
+            medRescueNote.setRecDate(DateUtil.parseDateTime(medRescueNoteVO.getRecDate()));//记录时间
+            medRescueNote.setStartTime(DateUtil.parseDateTime(medRescueNoteVO.getStartTime()));//开始时间
+            medRescueNote.setEndTime(DateUtil.parseDate(medRescueNoteVO.getEndTime()));//结束时间
+            medRescueNote.setRecordDate(DateUtil.parseDateTime(medRescueNoteVO.getRecordDate()));//病历日期
+
+            medRescueNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medRescueNote)){
+                medRescueNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medRescueNote);
+            }else{
+                medRescueNote.setGmtModified(new Date());//记录修改时间
+                this.update(medRescueNote,new QueryWrapper<MedRescueNote>()
+                        .eq("rec_id", medRescueNote.getRecId())
+                        .eq("hospital_id", medRescueNote.getHospitalId())
+                        .eq("behospital_code", medRescueNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", medRescueNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedRescueNote medRescueNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedRescueNote>()
+                .eq("rec_id", medRescueNote.getRecId())
+                .eq("hospital_id", medRescueNote.getHospitalId())
+                .eq("behospital_code", medRescueNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedTransferInNoteFacade.java

@@ -0,0 +1,87 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedTransferInNote;
+import com.diagbot.service.impl.MedTransferInNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedTransferInNoteVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medTransferInNote");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        MedTransferInNote medTransferInNote=new MedTransferInNote();
+        try {
+            AMedTransferInNoteVO medTransferInNoteVO=(AMedTransferInNoteVO) MapUtil.mapToObject(entityMap, AMedTransferInNoteVO.class);
+            BeanUtils.copyProperties(medTransferInNoteVO,medTransferInNote);
+            medTransferInNote.setHospitalId(hospitalId);//医院编码
+            medTransferInNote.setTransferInDate(DateUtil.parseDateTime(medTransferInNoteVO.getTransferInDate()));
+            medTransferInNote.setAuditDate(DateUtil.parseDateTime(medTransferInNoteVO.getAuditDate()));//审核时间
+            medTransferInNote.setRecDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecDate()));//记录时间
+            medTransferInNote.setRecordDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecordDate()));//病历日期
+
+            medTransferInNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(medTransferInNote)){
+                medTransferInNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medTransferInNote);
+            }else{
+                medTransferInNote.setGmtModified(new Date());//记录修改时间
+                this.update(medTransferInNote,new QueryWrapper<MedTransferInNote>()
+                        .eq("rec_id", medTransferInNote.getRecId())
+                        .eq("hospital_id", medTransferInNote.getHospitalId())
+                        .eq("behospital_code", medTransferInNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录",medTransferInNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(MedTransferInNote medTransferInNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedTransferInNote>()
+                .eq("rec_id", medTransferInNote.getRecId())
+                .eq("hospital_id", medTransferInNote.getHospitalId())
+                .eq("behospital_code", medTransferInNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}