Merge branch 'master' into his/tzmh

# Conflicts:
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
#	src/main/java/com/diagbot/dto/data/ADoctorAdviceDTO.java
#	src/main/java/com/diagbot/facade/data/ABasDoctorInfoFacade.java
#	src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java
#	src/main/java/com/diagbot/facade/data/AHomePageFacade.java
#	src/main/java/com/diagbot/facade/data/AMedRecordTypeFacade.java
#	src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java
#	src/main/java/com/diagbot/mapper/BasDoctorInfoMapper.java
#	src/main/java/com/diagbot/mapper/HomeDiagnoseInfoMapper.java
#	src/main/java/com/diagbot/mapper/HomeOperationInfoMapper.java
#	src/main/java/com/diagbot/mapper/HomePageMapper.java
#	src/main/java/com/diagbot/mapper/MedCrisisInfoMapper.java
#	src/main/java/com/diagbot/mapper/MedRecordTypeMapper.java
#	src/main/java/com/diagbot/mapper/MedicalRecordContentMapper.java
#	src/main/java/com/diagbot/service/impl/BasDeptInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/BasDoctorInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/HomeDiagnoseInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/HomeOperationInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/MedCrisisInfoServiceImpl.java
#	src/main/java/com/diagbot/service/impl/MedRecordTypeServiceImpl.java
#	src/main/java/com/diagbot/service/impl/MedicalRecordContentServiceImpl.java
#	src/main/java/com/diagbot/service/impl/MedicalRecordServiceImpl.java
#	src/main/java/com/diagbot/service/impl/QcTypeServiceImpl.java
#	src/main/java/com/diagbot/task/BasDeptInfoTask.java
#	src/main/java/com/diagbot/task/BasDoctorInfoTask.java
#	src/main/java/com/diagbot/util/TZDBConn.java
#	src/main/java/com/diagbot/vo/data/ADoctorAdviceVO.java
#	src/main/resources/mapper/DoctorAdviceMapper.xml
#	src/main/resources/mapper/MedRecordTypeMapper.xml

doc/008.20200610v1.3.3/qc_initv1.3.3.sql

@@ -0,0 +1,8 @@
+use `qc`;
+
+ALTER TABLE `med_behospital_info` ADD `placefile_date` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '归档时间' AFTER `is_placefile`;
+
+UPDATE `med_behospital_info` set `placefile_date` = date_add(leave_hospital_date,interval 3 day) where leave_hospital_date is not null;
+
+--  【已执行】 2020-06-11
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('290', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', 'leaveHospitalType', '出院情况', '2', '0', '病案首页诊断信息');

doc/009.20200612v1.3.4/qc_initv1.3.4.sql

@@ -0,0 +1,59 @@
+use `qc`;
+
+-- ----------------------------
+-- Table structure for sys_user_pageset
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_user_pageset`;
+CREATE TABLE `sys_user_pageset` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `user_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统用户表.用户ID',
+  `page_type` bigint(20) NOT NULL DEFAULT '0' COMMENT '页面分组（值自定义）',
+  `name` varchar(100) NOT NULL DEFAULT '' COMMENT '列名',
+  `val` varchar(100) NOT NULL DEFAULT '' COMMENT '列名值',
+  `status` int(11) NOT NULL DEFAULT '1' COMMENT '是否启用(0:停用，1：启用)',
+  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  KEY `idx_userId_pageType` (`user_id`,`page_type`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='用户页面设定表';
+
+-- ----------------------------
+-- Records of sys_user_pageset
+-- ----------------------------
+INSERT INTO `sys_user_pageset` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '病历等级', 'level', '1', '1', null);
+INSERT INTO `sys_user_pageset` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '病历得分', 'scoreRes', '1', '2', null);
+INSERT INTO `sys_user_pageset` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '病人住院序号', 'behospitalCode', '1', '3', null);
+INSERT INTO `sys_user_pageset` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '病案号', 'fileCode', '1', '4', null);
+INSERT INTO `sys_user_pageset` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '病人姓名', 'name', '1', '5', null);
+INSERT INTO `sys_user_pageset` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '性别', 'sex', '1', '6', null);
+INSERT INTO `sys_user_pageset` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '年龄', 'age', '1', '7', null);
+INSERT INTO `sys_user_pageset` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '床号', 'bedCode', '1', '8', null);
+INSERT INTO `sys_user_pageset` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '入院日期', 'behospitalDate', '1', '9', null);
+INSERT INTO `sys_user_pageset` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '出院日期', 'leaveHospitalDate', '1', '10', null);
+INSERT INTO `sys_user_pageset` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '归档日期', 'placefileDate', '1', '11', null);
+INSERT INTO `sys_user_pageset` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '主诊断', 'diagnose', '1', '12', null);
+INSERT INTO `sys_user_pageset` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '住院医生', 'behDoctorName', '1', '13', null);
+INSERT INTO `sys_user_pageset` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '主管医生', 'doctorName', '1', '14', null);
+INSERT INTO `sys_user_pageset` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '主任医生', 'directorDoctorName', '1', '15', null);
+INSERT INTO `sys_user_pageset` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '科室', 'behDeptName', '1', '16', null);
+INSERT INTO `sys_user_pageset` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '评分时间', 'gradeTime', '1', '17', null);
+
+ALTER TABLE `qc`.`med_doctor_advice` ADD COLUMN `medicine_type` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '药品类型(0.普药 1.抗生素 2.激素)' AFTER `da_prescription_type`;
+
+-- 121和122已经执行过下面的脚本
+ALTER TABLE `qc_cases_entry` ADD `dev_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '开发状态标识： 0-未开发  1-已开发' AFTER `rule_type`;
+ALTER TABLE `qc_cases_entry` ADD `accuracy_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '准确率类型：0-极高，1-高，2-中，3-低' AFTER `dev_type`;
+
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('291', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '未开发', '0', '1', '0', '开发状态标识');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('292', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '已开发', '1', '1', '1', '开发状态标识');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('293', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '极高', '0', '1', '0', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('294', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '高', '1', '1', '1', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('295', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '中', '2', '1', '2', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('296', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '低', '3', '1', '3', '准确率类型');
+
+-- alter table med_medical_record modify column `rec_date` datetime DEFAULT NULL COMMENT '病历日期';

pom.xml

@@ -210,6 +210,18 @@
             <version>${easypoi.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>6.2.0.jre8</version>
+            <scope>runtime</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -84,6 +84,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/dataimport/import").permitAll()
                 .antMatchers("/qc/dataimport/dataimportPrepare").permitAll()
                 .antMatchers("/qc/dataimport/test").permitAll()
+                .antMatchers("/sys/user/pageset/getPageSet").permitAll()
+                .antMatchers("/sys/user/pageset/savePageSet").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

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

@@ -113,19 +113,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/dataimport/import", request)
                 || matchers("/qc/dataimport/dataimportPrepare", request)
                 || matchers("/qc/dataimport/test", request)
-                || matchers("/qc/data/sendDoctorInfos", request)
-                || matchers("/qc/data/sendDeptInfos", request)
-                || matchers("/qc/data/sendRecordTypes", request)
-                || matchers("/qc/data/sendMrRecordIng", request)
-                || matchers("/qc/data/sendMrContent", request)
-                || matchers("/qc/data/sendMrRecord", request)
-                || matchers("/qc/data/sendPatientInfo", request)
-                || matchers("/qc/data/sendDoctorAdvice", request)
-                || matchers("/qc/data/sendHomePageIng", request)
-                || matchers("/qc/data/sendHomePage", request)
-                || matchers("/qc/data/sendHomeDiagnose", request)
-                || matchers("/qc/data/sendHomeOperation", request)
-                || matchers("/qc/data/sendCrisis", request)
+                || matchers("/sys/user/pageset/getPageSet", request)
+                || matchers("/sys/user/pageset/savePageSet", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -36,6 +37,7 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthday;
 
     /**
@@ -61,11 +63,13 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 入院时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
 
     /**
      * 出院时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
 
     /**
@@ -101,9 +105,16 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 评分时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
 
     private String directorDoctorName ;
 
     private String behDoctorName;
+
+    /**
+     * 归档时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date placefileDate;
 }

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

@@ -46,6 +46,11 @@ public class RecordContentDTO implements Serializable {
      */
     private String recTitle;
 
+    /**
+     * 医院文书id
+     */
+    private String recId;
+
     /**
      * 病历类别编号
      */

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

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

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

@@ -128,4 +128,9 @@ public class ADoctorAdviceDTO {
      * 开单医生姓名
      */
     private String doctorName;
+
+    /**
+     * 药品类型(0.普药 1.抗生素 2.激素)
+     */
+    private String medicineType;
 }

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

@@ -153,6 +153,11 @@ public class BehospitalInfo implements Serializable {
      */
     private String isPlacefile;
 
+    /**
+     * 归档时间
+     */
+    private Date placefileDate;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */
@@ -386,6 +391,14 @@ public class BehospitalInfo implements Serializable {
         this.isPlacefile = isPlacefile;
     }
 
+    public Date getPlacefileDate() {
+        return placefileDate;
+    }
+
+    public void setPlacefileDate(Date placefileDate) {
+        this.placefileDate = placefileDate;
+    }
+
     public String getIsDeleted() {
         return isDeleted;
     }

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

@@ -123,6 +123,11 @@ public class DoctorAdvice implements Serializable {
      */
     private String daPrescriptionType;
 
+    /**
+     * 药品类型(0.普药 1.抗生素 2.激素)
+     */
+    private String medicineType;
+
     /**
      * 医嘱领药类型
      */

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

@@ -50,6 +50,16 @@ public class QcCasesEntry implements Serializable {
      */
     private Integer ruleType;
 
+    /**
+     * 开发状态标识： 0-未开发  1-已开发
+     */
+    private Integer devType;
+
+    /**
+     * 准确率类型：0-极高，1-高，2-中，3-低
+     */
+    private Integer accuracyType;
+
     private String precond;
 
     /**

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

@@ -0,0 +1,197 @@
+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-12
+ */
+public class SysUserPageset implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 系统用户表.用户ID
+     */
+    private Long userId;
+
+    /**
+     * 页面分组（值自定义）
+     */
+    private Long pageType;
+
+    /**
+     * 列名
+     */
+    private String name;
+
+    /**
+     * 列名值
+     */
+    private String val;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    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;
+    }
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    public Long getPageType() {
+        return pageType;
+    }
+
+    public void setPageType(Long pageType) {
+        this.pageType = pageType;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getVal() {
+        return val;
+    }
+
+    public void setVal(String val) {
+        this.val = val;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "SysUserPageset{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", userId=" + userId +
+            ", pageType=" + pageType +
+            ", name=" + name +
+            ", val=" + val +
+            ", status=" + status +
+            ", orderNo=" + orderNo +
+            ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -273,7 +273,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         queryVo.setInputCatalogueMap(getInputCatalogueMap(qcCasesEntryDTOList)); // 设置质控条目编码
         List<MedrecVo> medrecVoList = new ArrayList<>(); // 设置内容
 
-
         // 添加住院病历信息
         List<BehospitalInfo> behospitalInfoList = this.list(new QueryWrapper<BehospitalInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -287,6 +286,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             content.put("content", behospitalInfoList);
             medrecVo.setContent(content);
             medrecVoList.add(medrecVo);
+
+            queryVo.setBehospitalInfo(behospitalInfoList.get(0));
         }
 
         // 会诊记录
@@ -354,10 +355,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         // 处理公共数据
         QueryVo queryVo = dealCommonData(hospitalId, analyzeVO);
+        queryVo.setUseCrfCache(analyzeVO.isUseCrfCache());
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!");
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
         }
         OutputInfo outputInfo = response.getData();
         //根据质控结果获取质控条目
@@ -724,6 +726,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             analyzeVO.setIsTask(true);
             analyzeVO.setHospitalId(bean.getHospitalId());
             analyzeVO.setBehospitalCode(bean.getBehospitalCode());
+            analyzeVO.setUseCrfCache(taskVO.isUseCrfCache());
             authServiceClient.analyze_rpc(analyzeVO);
         }
     }

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

@@ -8,7 +8,6 @@ import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -26,7 +25,6 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -60,14 +58,7 @@ public class ConsoleByDeptFacade {
      */
     public Map<String, Object> leaveHosCountByDept(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         //关联科室
         Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
@@ -122,14 +113,7 @@ public class ConsoleByDeptFacade {
     public Map<String, Object> mrCountByDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
         BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //关联科室
@@ -235,14 +219,7 @@ public class ConsoleByDeptFacade {
     public Map<String, Object> entryCountGroupByCaseAndDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
+        filterFacade.filterVOSet(filterVO);
         if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
             filterVO.setLimitCount(10);
         }
@@ -339,17 +316,7 @@ public class ConsoleByDeptFacade {
      */
     public Map<String, Object> entryCountGroupByEntryAndDept(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         //关联科室
         Map<String, Object> deptMap = getDeptByUser(filterVO);
@@ -417,54 +384,6 @@ public class ConsoleByDeptFacade {
     }
 
 
-    /**
-     * 过滤条件设置
-     *
-     * @param filterPageByDeptVO
-     */
-    private void filterPageByDeptVOSet(FilterPageByDeptVO filterPageByDeptVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = "";
-        String endDate = "";
-        Date date = new Date();
-
-        //统计维度 1-本月，2-本年
-        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-        if (filterPageByDeptVO.getType().equals(1)) {
-            if (filterPageByDeptVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            } else if (filterPageByDeptVO.getDateType().equals(2)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
-            } else if (filterPageByDeptVO.getDateType().equals(3)) {
-                String year = DateUtil.getYear(date);
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            }
-        } else if (filterPageByDeptVO.getType().equals(2)) {
-            if (filterPageByDeptVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            } else if (filterPageByDeptVO.getDateType().equals(2) || filterPageByDeptVO.getDateType().equals(3)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-            }
-        }
-
-        filterPageByDeptVO.setStartDate(startDate);
-        filterPageByDeptVO.setEndDate(endDate);
-        filterPageByDeptVO.setHospitalId(hospitalId);
-        filterPageByDeptVO.setUserId(Long.valueOf(userId));
-    }
-
     /**
      * 各模块缺陷占比-科室（分页）
      *
@@ -479,7 +398,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptNumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return page;
     }
@@ -501,7 +420,7 @@ public class ConsoleByDeptFacade {
         if (filterPageByDeptVO.getDeptName().equals(filterPageByDeptVO.getDoctorName())) {
             filterPageByDeptVO.setDoctorName("");
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         return page;
     }
@@ -520,7 +439,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptNumDTO> page = behospitalInfoFacade.resultStatisticsByDeptAndDoctorPage(filterPageByDeptVO);
         return page;
     }
@@ -539,7 +458,7 @@ public class ConsoleByDeptFacade {
                 filterPageByDeptVO.setDeptName(deptList.get(0).getDeptName());
             }
         }
-        filterPageByDeptVOSet(filterPageByDeptVO);
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
         IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryAndDeptInnerPage(filterPageByDeptVO);
         return page;
     }
@@ -558,14 +477,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDept(filterOrderByDeptVO);
         return records;
     }
@@ -584,14 +496,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO);
         //没有医生过滤时增加全科室数据
         if (StringUtil.isBlank(filterOrderByDeptVO.getName())
@@ -619,14 +524,7 @@ public class ConsoleByDeptFacade {
         if (StringUtil.isBlank(filterOrderByDeptVO.getDeptName())) {
             filterOrderByDeptVO.setDeptName(deptList.get(0).getDeptName());
         }
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterOrderByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderByDeptVO.getType(), null);
-        filterOrderByDeptVO.setStartDate(startDate);
-        filterOrderByDeptVO.setEndDate(endDate);
-        filterOrderByDeptVO.setHospitalId(hosptialId);
-        filterOrderByDeptVO.setUserId(Long.valueOf(userId));
+        filterFacade.filterOrderByDeptVOSet(filterOrderByDeptVO);
         if (filterOrderByDeptVO.getLimitCount() == null || filterOrderByDeptVO.getLimitCount().equals(0)) {
             filterOrderByDeptVO.setLimitCount(10);
         }

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

@@ -13,10 +13,8 @@ import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
-import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.FilterOrderVO;
 import com.diagbot.vo.FilterPageByAverageVO;
 import com.diagbot.vo.FilterPageVO;
@@ -29,7 +27,6 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -71,15 +68,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        filterVO.setHospitalId(hospitalId);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -99,15 +88,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> resultStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -127,15 +108,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> averageStatistics(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
+        filterFacade.filterVOSet(filterVO);
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("filterVO", filterVO);
@@ -159,7 +132,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageDayNum(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageDayNumList = averageStatisticsAggregate.getAverageDayNum(filterVO);
         if (ListUtil.isNotEmpty(averageDayNumList)) {
             retMap.put("平均住院日", averageDayNumList);
@@ -175,7 +148,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageFee(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageFeeList = averageStatisticsAggregate.getAverageFee(filterVO);
         if (ListUtil.isNotEmpty(averageFeeList)) {
             retMap.put("平均住院费用", averageFeeList);
@@ -191,7 +164,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getAverageScore(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> averageScoreList = averageStatisticsAggregate.getAverageScore(filterVO);
         if (ListUtil.isNotEmpty(averageScoreList)) {
             retMap.put("各科室质控平均分", averageScoreList);
@@ -206,7 +179,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<AverageStatisticsDTO> getAverageScoreByDeptClass(FilterVO filterVO) {
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<AverageStatisticsDTO> retAverageScoreList = Lists.newLinkedList();
         List<AverageStatisticsDTO> averageScoreList = qcresultInfoFacade.getAverageScoreByDeptClass(filterVO);
         Integer limitCount = filterVO.getLimitCount();
@@ -225,7 +198,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> getLevelResultDept(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<QcResultPercentDTO> levelResults = mrStatisticsAggregate.getLevelResultDept(filterVO);
         if (ListUtil.isNotEmpty(levelResults)) {
             retMap.put("各科室甲级病历占比", levelResults);
@@ -241,7 +214,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> leaveHosCount(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Map<String, Object> leaveHosMap = mrStatisticsAggregate.leaveHosCount(filterVO);
         if (leaveHosMap != null) {
             retMap.put("出院人数统计", leaveHosMap);
@@ -257,7 +230,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> mrCount(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> mrCountList = mrStatisticsAggregate.mrCount(filterVO);
         if (ListUtil.isNotEmpty(mrCountList)) {
             retMap.put("病历数统计", mrCountList);
@@ -273,7 +246,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryCountGroupByCase(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> caseList = resultStatisticsAggregate.entryCountGroupByCase(filterVO);
         if (ListUtil.isNotEmpty(caseList)) {
             retMap.put("各模块缺陷占比排行", caseList);
@@ -289,7 +262,7 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryCountGroupByEntry(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> entryList = resultStatisticsAggregate.entryCountGroupByEntry(filterVO);
         if (ListUtil.isNotEmpty(entryList)) {
             retMap.put("条目缺陷占比", entryList);
@@ -305,7 +278,7 @@ public class ConsoleFacade {
      */
     public List<EntryNumDTO> entryRejectPercent(FilterVO filterVO) {
         List<EntryNumDTO> retList = Lists.newLinkedList();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         List<EntryNumDTO> numDTOList = qcresultInfoFacade.entryRejectPercent(filterVO);
         if (ListUtil.isNotEmpty(numDTOList)) {
@@ -329,7 +302,7 @@ public class ConsoleFacade {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入病历等级");
         }
         List<DeptNumDTO> retList = Lists.newLinkedList();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         Integer limitCount = filterVO.getLimitCount();
         List<DeptNumDTO> numDTOList = qcresultInfoFacade.qcResultLevelPercent(filterVO);
         if (ListUtil.isNotEmpty(numDTOList)) {
@@ -350,102 +323,17 @@ public class ConsoleFacade {
      */
     public Map<String, Object> entryByDept(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
-        filterVOSet(filterVO);
+        filterFacade.filterVOSet(filterVO);
         List<NumDTO> deptList = resultStatisticsAggregate.entryByDept(filterVO);
         if (ListUtil.isNotEmpty(deptList)) {
             retMap.put("各科室缺陷占比", deptList);
         }
         return retMap;
     }
-
-    private void filterVOSet(FilterVO filterVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
-        filterVO.setStartDate(startDate);
-        filterVO.setEndDate(endDate);
-        filterVO.setHospitalId(hospitalId);
-        filterVO.setUserId(Long.valueOf(userId));
-        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
-            filterVO.setLimitCount(10);
-        }
-    }
     //endregion-----------------------单独接口结束-------------------------------
 
     //region_______________________分页接口开始-------------------------------
 
-    /**
-     * 过滤条件设置
-     *
-     * @param filterPageVO
-     */
-    private void filterPageVOSet(FilterPageVO filterPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String startDate = "";
-        String endDate = "";
-        Date date = new Date();
-
-        //统计维度 1-本月，2-本年
-        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-        if (filterPageVO.getType().equals(1)) {
-            if (filterPageVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            } else if (filterPageVO.getDateType().equals(2)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
-            } else if (filterPageVO.getDateType().equals(3)) {
-                String year = DateUtil.getYear(date);
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            }
-        } else if (filterPageVO.getType().equals(2)) {
-            if (filterPageVO.getDateType() == null) {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            } else if (filterPageVO.getDateType().equals(2) || filterPageVO.getDateType().equals(3)) {
-                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
-                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
-            } else {
-                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-            }
-        }
-
-        filterPageVO.setStartDate(startDate);
-        filterPageVO.setEndDate(endDate);
-        filterPageVO.setHospitalId(hospitalId);
-    }
-
-    /**
-     * 平均住院天数、平均花费入参设置
-     *
-     * @param filterPageByAverageVO
-     */
-    private void filterPageByAverageVOSet(FilterPageByAverageVO filterPageByAverageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        Date date = new Date();
-        String year = DateUtil.getYear(date);
-        String startDate = filterFacade.getStartDateStr(filterPageByAverageVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterPageByAverageVO.getType(), null);
-        String lastStartDate = filterFacade.getLastStartDateStr(filterPageByAverageVO.getType());
-        String lastEndDate = filterFacade.getLastEndDateStr(filterPageByAverageVO.getType());
-        String lastYearStartDate = filterFacade.getStartDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
-        String lastYearEndDate = filterFacade.getEndDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
-        filterPageByAverageVO.setHospitalId(hospitalId);
-        filterPageByAverageVO.setUserId(Long.valueOf(userId));
-        filterPageByAverageVO.setStartDate(startDate);
-        filterPageByAverageVO.setEndDate(endDate);
-        filterPageByAverageVO.setLastStartDate(lastStartDate);
-        filterPageByAverageVO.setLastEndDate(lastEndDate);
-        filterPageByAverageVO.setLastYearStartDate(lastYearStartDate);
-        filterPageByAverageVO.setLastYearEndDate(lastYearEndDate);
-    }
 
     /**
      * 各模块缺陷占比（分页）
@@ -454,7 +342,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<NumDTO> entryCountGroupByCasePage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCasePage(filterPageVO);
         return page;
     }
@@ -466,7 +354,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<EntryNumDTO> entryCountGroupByEntryPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         if (filterPageVO.getDeptName().equals("全院")) {
             filterPageVO.setDeptName("");
         }
@@ -481,7 +369,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageDayNumPage(FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVOSet(filterPageByAverageVO);
+        filterFacade.filterPageByAverageVOSet(filterPageByAverageVO);
         IPage<AverageStatisticsDTO> page = homePageFacade.getAverageDayNumPage(filterPageByAverageVO);
         return page;
     }
@@ -493,7 +381,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageFeePage(FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVOSet(filterPageByAverageVO);
+        filterFacade.filterPageByAverageVOSet(filterPageByAverageVO);
         IPage<AverageStatisticsDTO> page = homePageFacade.getAverageFeePage(filterPageByAverageVO);
         return page;
     }
@@ -505,7 +393,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<AverageStatisticsDTO> getAverageScoreByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<AverageStatisticsDTO> page = qcresultInfoFacade.getAverageScoreByDeptPage(filterPageVO);
         return page;
     }
@@ -517,7 +405,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<NumDTO> resultStatisticsByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<NumDTO> page = behospitalInfoFacade.resultStatisticsByDeptPage(filterPageVO);
         return page;
     }
@@ -529,7 +417,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<QcResultPercentDTO> levelPercentGroupByDeptPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<QcResultPercentDTO> page = qcresultInfoFacade.levelPercentGroupByDeptPage(filterPageVO);
         return page;
     }
@@ -541,7 +429,7 @@ public class ConsoleFacade {
      * @return
      */
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(FilterPageVO filterPageVO) {
-        filterPageVOSet(filterPageVO);
+        filterFacade.filterPageVOSet(filterPageVO);
         IPage<EntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryInnerPage(filterPageVO);
         return page;
     }
@@ -554,12 +442,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatistics(filterOrderVO);
         return records;
     }
@@ -571,12 +454,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass2(filterOrderVO);
         return records;
     }
@@ -588,12 +466,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO) {
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         //没有科室过滤时增加全院数据
         if (StringUtil.isBlank(filterOrderVO.getName()) || filterOrderVO.getName().equals("全院")) {
@@ -612,16 +485,7 @@ public class ConsoleFacade {
      * @return
      */
     public List<HomePageNumDTO> homePageLevelLimit(FilterOrderVO filterOrderVO) {
-
-        String hosptialId = SysUserUtils.getCurrentHospitalID();
-        String startDate = filterFacade.getStartDateStr(filterOrderVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterOrderVO.getType(), null);
-        filterOrderVO.setStartDate(startDate);
-        filterOrderVO.setEndDate(endDate);
-        filterOrderVO.setHospitalId(hosptialId);
-        if (filterOrderVO.getLimitCount() == null || filterOrderVO.getLimitCount().equals(0)) {
-            filterOrderVO.setLimitCount(10);
-        }
+        filterFacade.filterOrderVOSet(filterOrderVO);
         List<HomePageNumDTO> records = behospitalInfoFacade.homePageLevelStatistics(filterOrderVO);
         HomePageNumDTO item = getGlobleRecord(records);
         if (item != null) {

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

@@ -1,8 +1,19 @@
 package com.diagbot.facade;
 
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.FilterOrderByDeptVO;
+import com.diagbot.vo.FilterOrderVO;
+import com.diagbot.vo.FilterPageByAverageVO;
+import com.diagbot.vo.FilterPageByDeptVO;
+import com.diagbot.vo.FilterPageVO;
+import com.diagbot.vo.FilterVO;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -91,4 +102,142 @@ public class FilterFacade {
         //上一统计周期的截止时间等于本周期的起始时间
         return getStartDateStr(type, null);
     }
-}
+
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+    public void filterVOSet(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+
+        if (StringUtil.isBlank(filterVO.getStartDate())) {
+            String startDate = getStartDateStr(filterVO.getType(), null);
+            filterVO.setStartDate(startDate);
+        }
+        if (StringUtil.isBlank(filterVO.getEndDate())) {
+            String endDate = getEndDateStr(filterVO.getType(), null);
+            filterVO.setEndDate(endDate);
+        } else {
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = dateFormat.parse(filterVO.getEndDate());
+                long interval = date.getTime() + 1000;
+                filterVO.setEndDate(dateFormat.format(new Date(Long.valueOf(interval))));
+            } catch (ParseException e) {
+
+            }
+        }
+    }
+
+    /**
+     * 分页入参拼接
+     *
+     * @param filterPageVO
+     */
+    public void filterPageVOSet(FilterPageVO filterPageVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterPageVO.setHospitalId(hospitalId);
+        filterPageVO.setUserId(Long.valueOf(userId));
+        String startDate = "";
+        String endDate = "";
+        if (StringUtil.isBlank(filterPageVO.getStartDate())) {
+            startDate = getStartDateStr(filterPageVO.getType(), null);
+            filterPageVO.setStartDate(startDate);
+        }
+        if (StringUtil.isBlank(filterPageVO.getEndDate())) {
+            endDate = getEndDateStr(filterPageVO.getType(), null);
+            filterPageVO.setEndDate(endDate);
+        } else {
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = dateFormat.parse(filterPageVO.getEndDate());
+                long interval = date.getTime() + 1000;
+                filterPageVO.setEndDate(dateFormat.format(new Date(Long.valueOf(interval))));
+            } catch (ParseException e) {
+
+            }
+        }
+    }
+
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterPageByDeptVO
+     */
+    public void filterPageByDeptVOSet(FilterPageByDeptVO filterPageByDeptVO) {
+        FilterPageVO filterPageVO = new FilterPageVO();
+        BeanUtil.copyProperties(filterPageByDeptVO, filterPageVO);
+        filterPageVOSet(filterPageVO);
+        filterPageByDeptVO.setHospitalId(filterPageVO.getHospitalId());
+        filterPageByDeptVO.setUserId(filterPageVO.getUserId());
+        filterPageByDeptVO.setStartDate(filterPageVO.getStartDate());
+        filterPageByDeptVO.setEndDate(filterPageVO.getEndDate());
+    }
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterOrderVO
+     */
+    public void filterOrderVOSet(FilterOrderVO filterOrderVO) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderVO, filterVO);
+        filterVOSet(filterVO);
+        filterOrderVO.setHospitalId(filterVO.getHospitalId());
+        filterOrderVO.setUserId(filterVO.getUserId());
+        filterOrderVO.setStartDate(filterVO.getStartDate());
+        filterOrderVO.setEndDate(filterVO.getEndDate());
+        filterOrderVO.setLimitCount(filterVO.getLimitCount());
+    }
+
+    /**
+     * 过滤条件设置
+     *
+     * @param filterOrderByDeptVO
+     */
+    public void filterOrderByDeptVOSet(FilterOrderByDeptVO filterOrderByDeptVO) {
+        FilterVO filterVO = new FilterVO();
+        BeanUtil.copyProperties(filterOrderByDeptVO, filterVO);
+        filterVOSet(filterVO);
+        filterOrderByDeptVO.setHospitalId(filterVO.getHospitalId());
+        filterOrderByDeptVO.setUserId(filterVO.getUserId());
+        filterOrderByDeptVO.setStartDate(filterVO.getStartDate());
+        filterOrderByDeptVO.setEndDate(filterVO.getEndDate());
+        filterOrderByDeptVO.setLimitCount(filterVO.getLimitCount());
+    }
+
+    /**
+     * 平均住院天数、平均花费入参设置
+     *
+     * @param filterPageByAverageVO
+     */
+    public void filterPageByAverageVOSet(FilterPageByAverageVO filterPageByAverageVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        Date date = new Date();
+        String year = DateUtil.getYear(date);
+        String startDate = getStartDateStr(filterPageByAverageVO.getType(), null);
+        String endDate = getEndDateStr(filterPageByAverageVO.getType(), null);
+        String lastStartDate = getLastStartDateStr(filterPageByAverageVO.getType());
+        String lastEndDate = getLastEndDateStr(filterPageByAverageVO.getType());
+        String lastYearStartDate = getStartDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
+        String lastYearEndDate = getEndDateStr(filterPageByAverageVO.getType(), Integer.valueOf(year) - 1);
+        filterPageByAverageVO.setHospitalId(hospitalId);
+        filterPageByAverageVO.setUserId(Long.valueOf(userId));
+        filterPageByAverageVO.setStartDate(startDate);
+        filterPageByAverageVO.setEndDate(endDate);
+        filterPageByAverageVO.setLastStartDate(lastStartDate);
+        filterPageByAverageVO.setLastEndDate(lastEndDate);
+        filterPageByAverageVO.setLastYearStartDate(lastYearStartDate);
+        filterPageByAverageVO.setLastYearEndDate(lastYearEndDate);
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.SysUserPagesetDTO;
+import com.diagbot.entity.SysUserPageset;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.SysUserPagesetServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.SysUserPagesetQueryVO;
+import com.diagbot.vo.SysUserPagesetSaveVO;
+import com.diagbot.vo.SysUserPagesetVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:25
+ */
+@Component
+public class SysUserPagesetFacade extends SysUserPagesetServiceImpl {
+    @Autowired
+    @Qualifier("sysUserPagesetServiceImpl")
+    private SysUserPagesetServiceImpl sysUserPagesetService;
+
+    /**
+     * 获取用户对应页面设置
+     *
+     * @param sysUserPagesetQueryVO 获取用户对应页面设置参数
+     * @return 对应页面设置列表
+     */
+    public List<SysUserPagesetDTO> getPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        List<SysUserPageset> sysUserPagesetList = sysUserPagesetService.list(
+                new QueryWrapper<SysUserPageset>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("user_id", SysUserUtils.getCurrentPrincipleID())
+                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
+                        .orderByAsc("order_no")
+        );
+
+        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
+        if (ListUtil.isEmpty(sysUserPagesetList)) {
+            List<SysUserPageset> sysUserPagesetListDefault = sysUserPagesetService.list(
+                    new QueryWrapper<SysUserPageset>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("user_id", -1)
+                            .eq("page_type", sysUserPagesetQueryVO.getPageType())
+                            .orderByAsc("order_no")
+            );
+            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
+        } else {
+            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetList, SysUserPagesetDTO.class);
+        }
+        return sysUserPagesetDTOList;
+    }
+
+    /**
+     * 保存用户对应页面设置
+     *
+     * @param sysUserPagesetSaveVO 保存用户对应页面设置参数
+     * @return 是否成功
+     */
+    public Boolean savePageSet(SysUserPagesetSaveVO sysUserPagesetSaveVO) {
+        if (ListUtil.isEmpty(sysUserPagesetSaveVO.getSysUserPagesetVOList())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "列名输入列表不能为空");
+        }
+        sysUserPagesetService.remove(
+                new QueryWrapper<SysUserPageset>()
+                        .eq("user_id", SysUserUtils.getCurrentPrincipleID())
+                        .eq("page_type", sysUserPagesetSaveVO.getPageType())
+        );
+        List<SysUserPageset> saveList = new ArrayList<>();
+        Date now = DateUtil.now();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        for (SysUserPagesetVO sysUserPagesetVO : sysUserPagesetSaveVO.getSysUserPagesetVOList()) {
+            SysUserPageset sysUserPageset = new SysUserPageset();
+            BeanUtil.copyProperties(sysUserPagesetVO, sysUserPageset);
+            sysUserPageset.setPageType(sysUserPagesetSaveVO.getPageType());
+            sysUserPageset.setUserId(Long.valueOf(userId));
+            sysUserPageset.setCreator(userId);
+            sysUserPageset.setModifier(userId);
+            sysUserPageset.setGmtCreate(now);
+            sysUserPageset.setGmtModified(now);
+            saveList.add(sysUserPageset);
+        }
+        return sysUserPagesetService.saveBatch(saveList);
+    }
+
+}

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

@@ -5,7 +5,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABasDoctorInfoDTO;
 import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.service.impl.MedQcresultCasesServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ABasDoctorInfoVO;

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

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
 import com.diagbot.entity.*;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.MedRecordType;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;

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

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.entity.HomePage;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
@@ -13,7 +11,6 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.AnalyzeApiVO;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.data.AHomeDiagnoseVO;
 import com.diagbot.vo.data.AHomeOperationVO;

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

@@ -3,9 +3,7 @@ package com.diagbot.facade.data;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordTypeDTO;
-import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.entity.MedRecordType;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedRecordTypeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
@@ -15,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -72,8 +71,10 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
                         .eq("type_id", s.getTypeId())
                         .eq("hospital_id", s.getHospitalId()));
                 if (mrType != null) {
+                    s.setGmtModified(new Date());
                     updateE.add(s);
                 } else {
+                    s.setGmtCreate(new Date());
                     addE.add(s);
                 }
             });

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

@@ -8,7 +8,6 @@ import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
-import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
@@ -16,7 +15,6 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
 import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.AnalyzeApiVO;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.data.AMedicalRecordVO;
 import com.diagbot.vo.data.AMrContentVO;

src/main/java/com/diagbot/mapper/HomeDiagnoseInfoMapper.java

@@ -14,5 +14,7 @@ import java.util.List;
  * @since 2020-04-13
  */
 public interface HomeDiagnoseInfoMapper extends BaseMapper<HomeDiagnoseInfo> {
+
     public void updateBatchByKey(List<HomeDiagnoseInfo> list);
+
 }

src/main/java/com/diagbot/mapper/HomeOperationInfoMapper.java

@@ -14,5 +14,7 @@ import java.util.List;
  * @since 2020-04-13
  */
 public interface HomeOperationInfoMapper extends BaseMapper<HomeOperationInfo> {
+
     public void updateBatchByKey(List<HomeOperationInfo> list);
+
 }

src/main/java/com/diagbot/mapper/HomePageMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.AverageStatisticsDTO;
 import com.diagbot.entity.HomePage;
 import com.diagbot.vo.FilterPageByAverageVO;
+import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -57,4 +58,5 @@ public interface HomePageMapper extends BaseMapper<HomePage> {
      * @param list
      */
     public void updateBatchByKey(List<HomePage> list);
+
 }

src/main/java/com/diagbot/mapper/MedCrisisInfoMapper.java

@@ -11,8 +11,10 @@ import java.util.List;
  * </p>
  *
  * @author zhoutg
- * @since 2020-05-28
+ * @since 2020-06-02
  */
 public interface MedCrisisInfoMapper extends BaseMapper<MedCrisisInfo> {
+
     public void updateBatchByKey(List<MedCrisisInfo> list);
+
 }

src/main/java/com/diagbot/mapper/MedRecordTypeMapper.java

@@ -14,5 +14,7 @@ import java.util.List;
  * @since 2020-04-13
  */
 public interface MedRecordTypeMapper extends BaseMapper<MedRecordType> {
+
     public void updateBatchByKey(List<MedRecordType> list);
+
 }

src/main/java/com/diagbot/mapper/MedicalRecordContentMapper.java

@@ -14,5 +14,7 @@ import java.util.List;
  * @since 2020-04-13
  */
 public interface MedicalRecordContentMapper extends BaseMapper<MedicalRecordContent> {
+
     public void updateBatchByKey(List<MedicalRecordContent> list);
+
 }

src/main/java/com/diagbot/mapper/SysUserPagesetMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.SysUserPageset;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户页面设定表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-12
+ */
+public interface SysUserPagesetMapper extends BaseMapper<SysUserPageset> {
+
+}

src/main/java/com/diagbot/service/SysUserPagesetService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.SysUserPageset;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户页面设定表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-12
+ */
+public interface SysUserPagesetService extends IService<SysUserPageset> {
+
+}

src/main/java/com/diagbot/service/impl/BasDeptInfoServiceImpl.java

@@ -44,6 +44,11 @@ public class BasDeptInfoServiceImpl extends ServiceImpl<BasDeptInfoMapper, BasDe
         return baseMapper.getDeptByUser(filterVO);
     }
 
+
+    /**
+     * 根据科室编码，医院编码，批量修改
+     * @param list
+     */
     public void updateBatchByKey(List<BasDeptInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/BasDoctorInfoServiceImpl.java

@@ -25,4 +25,8 @@ public class BasDoctorInfoServiceImpl extends ServiceImpl<BasDoctorInfoMapper, B
     public void updateBatchByKey(List<BasDoctorInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }
+  <<<<<<< HEAD
+=======
+
+>>>>>>> master
 }

src/main/java/com/diagbot/service/impl/BasHospitalInfoServiceImpl.java

@@ -17,4 +17,5 @@ import org.springframework.stereotype.Service;
 @Service
 public class BasHospitalInfoServiceImpl extends ServiceImpl<BasHospitalInfoMapper, BasHospitalInfo> implements BasHospitalInfoService {
 
+
 }

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -282,6 +282,10 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.exportQcresultByDept(exportQcresultVO);
     }
 
+    /**
+     * 根据编码、医院编码批量更新
+     * @param list
+     */
     public void updateBatchByKey(List<BehospitalInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/HomeDiagnoseInfoServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.mapper.HomeDiagnoseInfoMapper;
 import com.diagbot.service.HomeDiagnoseInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
 /**
@@ -18,6 +17,10 @@ import java.util.List;
  */
 @Service
 public class HomeDiagnoseInfoServiceImpl extends ServiceImpl<HomeDiagnoseInfoMapper, HomeDiagnoseInfo> implements HomeDiagnoseInfoService {
+    /**
+     * 根据病案首页编码、医院编码、手术序号批量更新
+     * @param list
+     */
     public void updateBatchByKey(List<HomeDiagnoseInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/HomeOperationInfoServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-
 /**
  * <p>
  *  服务实现类

src/main/java/com/diagbot/service/impl/MedCrisisInfoServiceImpl.java

@@ -7,17 +7,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-
 /**
  * <p>
  * 危急值信息 服务实现类
  * </p>
  *
  * @author zhoutg
- * @since 2020-05-28
+ * @since 2020-06-02
  */
 @Service
 public class MedCrisisInfoServiceImpl extends ServiceImpl<MedCrisisInfoMapper, MedCrisisInfo> implements MedCrisisInfoService {
+
+    /**
+     * 根据编码、医院编码、病人住院ID-批量更新
+     * @param list
+     */
     public void updateBatchByKey(List<MedCrisisInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/MedRecordTypeServiceImpl.java

@@ -5,9 +5,7 @@ import com.diagbot.mapper.MedRecordTypeMapper;
 import com.diagbot.service.MedRecordTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
-
 /**
  * <p>
  *  服务实现类
@@ -18,6 +16,10 @@ import java.util.List;
  */
 @Service
 public class MedRecordTypeServiceImpl extends ServiceImpl<MedRecordTypeMapper, MedRecordType> implements MedRecordTypeService {
+    /**
+     * 根据医院编码、文书类型编码批量更新
+     * @param list
+     */
     public void updateBatchByKey(List<MedRecordType> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/MedicalRecordContentServiceImpl.java

@@ -5,7 +5,6 @@ import com.diagbot.mapper.MedicalRecordContentMapper;
 import com.diagbot.service.MedicalRecordContentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
 /**
@@ -18,6 +17,10 @@ import java.util.List;
  */
 @Service
 public class MedicalRecordContentServiceImpl extends ServiceImpl<MedicalRecordContentMapper, MedicalRecordContent> implements MedicalRecordContentService {
+    /**
+     * 根据文书编码、医院编码
+     * @param list
+     */
     public void updateBatchByKey(List<MedicalRecordContent> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/MedicalRecordServiceImpl.java

@@ -26,6 +26,10 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
         return baseMapper.getRecordContent(recordContentVO);
     }
 
+    /**
+     * 根据文书编码、医院编码、病人住院编码
+     * @param list
+     */
     public void updateBatchByKey(List<MedicalRecord> list){
         this.baseMapper.updateBatchByKey(list);
     }

src/main/java/com/diagbot/service/impl/QcTypeServiceImpl.java

@@ -25,6 +25,11 @@ public class QcTypeServiceImpl extends ServiceImpl<QcTypeMapper, QcType> impleme
         return baseMapper.getList(qcTypePageVO);
     }
 
+    /**
+     * 保存，并返回ID
+     * @param qcType
+     * @return
+     */
     public Long saveT(QcType qcType){
         this.baseMapper.insert(qcType);
         QueryWrapper<QcType> qWrapper =new QueryWrapper<>();

src/main/java/com/diagbot/service/impl/SysUserPagesetServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.SysUserPageset;
+import com.diagbot.mapper.SysUserPagesetMapper;
+import com.diagbot.service.SysUserPagesetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户页面设定表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-12
+ */
+@Service
+public class SysUserPagesetServiceImpl extends ServiceImpl<SysUserPagesetMapper, SysUserPageset> implements SysUserPagesetService {
+
+}

src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -47,7 +47,11 @@ public class BasDeptInfoTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
+<<<<<<< HEAD
                     aBasDeptInfoFacade.executeDept();
+=======
+                    //aBasDeptInfoFacade.executeDept();
+>>>>>>> master
                 }
             }
         }, new Trigger() {

src/main/java/com/diagbot/task/BasDoctorInfoTask.java

@@ -46,7 +46,7 @@ public class BasDoctorInfoTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    aBasDoctorInfoFacade.executeDoctor();
+                    //aBasDoctorInfoFacade.executeDoctor();
                 }
             }
         }, new Trigger() {

src/main/java/com/diagbot/util/TZDBConn.java

@@ -270,9 +270,13 @@ public class TZDBConn {
 				homePageVO.setName(rs.getString("BRBAXM"));//姓名
 				homePageVO.setSex(rs.getString("BRBAXB"));//性别
 				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
+<<<<<<< HEAD
 				if(StringUtil.isNotBlank(rs.getString("BRDQNL"))){
 				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
 				}
+=======
+				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
+>>>>>>> master
 				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
 				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
 				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
@@ -558,7 +562,11 @@ public class TZDBConn {
 				behospitalInfo.setDiagnose(rs.getString("JBMSXX"));//疾病名称
 				behospitalInfo.setDoctorId(rs.getString("ZZYSID"));//医生ID
 				behospitalInfo.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
+<<<<<<< HEAD
 				behospitalInfo.setIsPlacefile(rs.getString("requestflag"));
+=======
+				
+>>>>>>> master
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {

src/main/java/com/diagbot/vo/AnalyzeVO.java

@@ -18,4 +18,7 @@ public class AnalyzeVO {
     private Boolean isTask = false;
     @ApiModelProperty(hidden = true)
     private Long modeId;
+    // 是否使用CRF缓存(false: 不使用缓存，true：使用缓存)
+    @ApiModelProperty(hidden = true)
+    private boolean useCrfCache;
 }

src/main/java/com/diagbot/vo/FilterPageVO.java

@@ -20,19 +20,13 @@ public class FilterPageVO extends Page {
      */
     @NotNull(message = "请输入本年或本月")
     private Integer type;
-    /**
-     * 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
-     */
-    private Integer dateType;
     /**
      * 起始时间
      */
-    @ApiModelProperty(hidden = true)
     private String startDate;
     /**
      * 结束时间
      */
-    @ApiModelProperty(hidden = true)
     private String endDate;
     /**
      * 医院id

src/main/java/com/diagbot/vo/FilterVO.java

@@ -22,12 +22,10 @@ public class FilterVO {
     /**
      * 起始时间
      */
-    @ApiModelProperty(hidden = true)
     private String startDate;
     /**
      * 结束时间
      */
-    @ApiModelProperty(hidden = true)
     private String endDate;
     /**
      * 医院id

src/main/java/com/diagbot/vo/QueryVo.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.entity.BehospitalInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,4 +25,8 @@ public class QueryVo extends TokenVO {
     private String cid;
 
     private String hospitalId;
+    // 是否使用CRF缓存(false: 不使用缓存，true：使用缓存)
+    private boolean useCrfCache;
+    // 添加基本病历信息
+    private BehospitalInfo behospitalInfo;
 }

src/main/java/com/diagbot/vo/SysUserPagesetQueryVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:30
+ */
+@Getter
+@Setter
+public class SysUserPagesetQueryVO {
+
+    /**
+     * 页面分组（值自定义）
+     */
+    @NotNull(message = "请输入页面分组")
+    private Long pageType;
+}

src/main/java/com/diagbot/vo/SysUserPagesetSaveVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:30
+ */
+@Getter
+@Setter
+public class SysUserPagesetSaveVO {
+    /**
+     * 页面分组（值自定义）
+     */
+    @NotNull(message = "请输入页面分组")
+    private Long pageType;
+
+    private List<SysUserPagesetVO> sysUserPagesetVOList;
+}

src/main/java/com/diagbot/vo/SysUserPagesetVO.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:26
+ */
+@Getter
+@Setter
+public class SysUserPagesetVO {
+    /**
+     * 列名
+     */
+    @NotBlank(message = "请输入列名")
+    private String name;
+
+    /**
+     * 列名值
+     */
+    @NotBlank(message = "请输入列名值")
+    private String val;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    @NotNull(message = "请输入是否启用装填")
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    @NotNull(message = "请输入排序号")
+    private Integer orderNo;
+}

src/main/java/com/diagbot/vo/TaskVO.java

@@ -30,4 +30,6 @@ public class TaskVO {
     // 出院时间过滤
     @ApiModelProperty(hidden = true)
     private Date endLeaveDate;
+    // 是否使用CRF缓存
+    private boolean useCrfCache;
 }

src/main/java/com/diagbot/vo/data/ADoctorAdviceVO.java

@@ -125,4 +125,9 @@ public class ADoctorAdviceVO {
      * 开单医生姓名
      */
     private String doctorName;
+
+    /**
+     * 药品类型(0.普药 1.抗生素 2.激素)
+     */
+    private String medicineType;
 }

src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -78,6 +78,7 @@ public class BehospitalInfoController {
     @SysLogger("analyze")
     @Transactional
     public RespDTO<AnalyzeDTO> analyze(@RequestBody AnalyzeVO analyzeVO) {
+        analyzeVO.setUseCrfCache(true);
         return RespDTO.onSuc(behospitalInfoFacade.analyze(analyzeVO));
     }
 
@@ -153,7 +154,8 @@ public class BehospitalInfoController {
                     "<br>" +
                     "type：类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)<br>" +
                     "hosptialIdList：医院列表id，1：长兴，3：台州，2：邵逸夫<br>" +
-                    "filterFlag： 筛选病历数据：0：未评分的病历，【推荐使用】；1：全部病历,【谨慎使用】")
+                    "filterFlag： 筛选病历数据：0：未评分的病历，【推荐使用】；1：全部病历,【谨慎使用】<br>" +
+                    "useCrfCache: 是否使用crf缓存（true：使用crf缓存，false：不使用）")
     @PostMapping("/execule")
     @SysLogger("execule")
     public RespDTO<Boolean> execule(@RequestBody TaskVO taskVO) {

src/main/java/com/diagbot/web/SysUserPagesetController.java

@@ -0,0 +1,59 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SysUserPagesetDTO;
+import com.diagbot.facade.SysUserPagesetFacade;
+import com.diagbot.vo.SysUserPagesetQueryVO;
+import com.diagbot.vo.SysUserPagesetSaveVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户页面设定表 前端控制器
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-12
+ */
+@RestController
+@Api(value = "用户页面设置API", tags = { "用户页面设置API" })
+@RequestMapping("/sys/user/pageset")
+@SuppressWarnings("unchecked")
+public class SysUserPagesetController {
+
+    @Autowired
+    private SysUserPagesetFacade sysUserPagesetFacade;
+
+    @ApiOperation(value = "获取用户对应页面设置[by:gaodm]",
+            notes = "pageType：页面分组，必填<br>")
+    @PostMapping("/getPageSet")
+    @SysLogger("getPageSet")
+    public RespDTO<List<SysUserPagesetDTO>> getPageSet(@RequestBody @Valid SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        return RespDTO.onSuc(sysUserPagesetFacade.getPageSet(sysUserPagesetQueryVO));
+    }
+
+
+    @ApiOperation(value = "保存用户对应页面设置[by:gaodm]",
+            notes = "pageType：页面分组，必填<br>" +
+                    "name： 列名，必填<br>" +
+                    "val： 列名值，必填<br>" +
+                    "status：  是否启用(0:停用，1：启用)，必填<br>" +
+                    "orderNo： 排序号，必填<br>")
+    @PostMapping("/savePageSet")
+    @SysLogger("savePageSet")
+    public RespDTO<Boolean> savePageSet(@RequestBody @Valid SysUserPagesetSaveVO sysUserPagesetSaveVO) {
+        return RespDTO.onSuc(sysUserPagesetFacade.savePageSet(sysUserPagesetSaveVO));
+    }
+}

src/main/resources/application-dev.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-local.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-pre.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -164,7 +165,7 @@ qc.address: http://192.168.2.186:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/application-pro.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -164,7 +165,7 @@ qc.address: http://192.168.2.123:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/application-test.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:
@@ -164,7 +165,7 @@ qc.address: http://192.168.2.241:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -31,6 +31,7 @@
         <result column="director_doctor_id" property="directorDoctorId"/>
         <result column="director_doctor_name" property="directorDoctorName"/>
         <result column="is_placefile" property="isPlacefile"/>
+        <result column="placefile_date" property="placefileDate"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
@@ -2041,6 +2042,7 @@
         AND b.cases_id = c.cases_id
         AND c.cases_id = d.cases_id
         AND c.cases_entry_id = d.id
+        AND a.beh_dept_id = e.dept_id
         AND a.is_placefile = '1'
         AND d.cases_id = 243
         <![CDATA[AND a.qc_type_id <>0 ]]>
@@ -2351,7 +2353,7 @@
         t1.score,
         t2.avgScore,
         t1.msg,
-        t1.casesName
+        t1.caseName
         FROM
         (
         SELECT
@@ -2365,7 +2367,7 @@
         a.leave_hospital_date AS leaveHospitalDate,
         b.score_res AS score,
         c.msg AS msg,
-        d.NAME AS casesName,
+        d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
         a.beh_dept_name AS behDeptName
         FROM
@@ -2489,7 +2491,7 @@
         t1.behDeptName,
         t1.patName,
         t1.behospitalCode,
-        t1.casesName
+        t1.caseName
     </select>
 
     <update id="updateBatchByKey">

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -24,6 +24,7 @@
         <result column="da_stop_date" property="daStopDate" />
         <result column="da_group_no" property="daGroupNo" />
         <result column="da_prescription_type" property="daPrescriptionType" />
+        <result column="medicine_type" property="medicineType" />
         <result column="da_med_type" property="daMedType" />
         <result column="doctor_notice" property="doctorNotice" />
         <result column="doctor_id" property="doctorId" />
@@ -35,81 +36,86 @@
         <result column="modifier" property="modifier" />
     </resultMap>
 
+
     <update id="updateBatchByKey">
-    <foreach collection="list" item="item"  separator=";">
-        update med_doctor_advice
-        <set>
-            <if test="item.orderDoctorName != null">
-                order_doctor_name = #{item.orderDoctorName},
-            </if>
-            <if test="item.frequency != null">
-                frequency = #{item.frequency},
-            </if>
-            <if test="item.parentTypeId != null">
-                parent_type_id = #{item.parentTypeId},
-            </if>
-            <if test="item.doctorAdviceType != null">
-                doctor_advice_type = #{item.doctorAdviceType},
-            </if>
-            <if test="item.usageNum != null">
-                usage_num = #{item.usageNum},
-            </if>
-            <if test="item.usageUnit != null">
-                usage_unit = #{item.usageUnit},
-            </if>
-            <if test="item.dose != null">
-                dose = #{item.dose},
-            </if>
-            <if test="item.doseUnit != null">
-                dose_unit = #{item.doseUnit},
-            </if>
-            <if test="item.medModeType != null">
-                med_mode_type = #{item.medModeType},
-            </if>
-            <if test="item.daFrequency != null">
-                da_frequency = #{item.daFrequency},
-            </if>
-            <if test="item.daDealType != null">
-                da_deal_type = #{item.daDealType},
-            </if>
-            <if test="item.daStartDate != null">
-                da_start_date = #{item.daStartDate},
-            </if>
-            <if test="item.daItemName != null">
-                da_item_name = #{item.daItemName},
-            </if>
-            <if test="item.daStatus != null">
-                da_status = #{item.daStatus},
-            </if>
-            <if test="item.daStopDate != null">
-                da_stop_date = #{item.daStopDate},
-            </if>
-            <if test="item.daGroupNo != null">
-                da_group_no = #{item.daGroupNo},
-            </if>
-            <if test="item.daPrescriptionType != null">
-                da_prescription_type = #{item.daPrescriptionType},
-            </if>
-            <if test="item.daMedType != null">
-                da_med_type = #{item.daMedType},
-            </if>
-            <if test="item.doctorNotice != null">
-                doctor_notice = #{item.doctorNotice},
-            </if>
-            <if test="item.doctorId != null">
-                doctor_id = #{item.doctorId},
-            </if>
-            <if test="item.doctorName != null">
-                doctor_name = #{item.doctorName},
-            </if>
-            <if test="item.gmtModified != null">
-                gmt_modified = #{item.gmtModified},
-            </if>
-            <if test="item.modifier != null">
-                modifier = #{item.modifier},
-            </if>
-        </set>
-        where doctor_advice_id = #{item.doctorAdviceId} and hospital_id = #{item.hospitalId} and behospital_code = #{item.behospitalCode}
-    </foreach>
+        <foreach collection="list" item="item"  separator=";">
+            update med_doctor_advice
+            <set>
+                <if test="item.orderDoctorName != null">
+                    order_doctor_name = #{item.orderDoctorName},
+                </if>
+                <if test="item.frequency != null">
+                    frequency = #{item.frequency},
+                </if>
+                <if test="item.parentTypeId != null">
+                    parent_type_id = #{item.parentTypeId},
+                </if>
+                <if test="item.doctorAdviceType != null">
+                    doctor_advice_type = #{item.doctorAdviceType},
+                </if>
+                <if test="item.usageNum != null">
+                    usage_num = #{item.usageNum},
+                </if>
+                <if test="item.usageUnit != null">
+                    usage_unit = #{item.usageUnit},
+                </if>
+                <if test="item.dose != null">
+                    dose = #{item.dose},
+                </if>
+                <if test="item.doseUnit != null">
+                    dose_unit = #{item.doseUnit},
+                </if>
+                <if test="item.medModeType != null">
+                    med_mode_type = #{item.medModeType},
+                </if>
+                <if test="item.daFrequency != null">
+                    da_frequency = #{item.daFrequency},
+                </if>
+                <if test="item.daDealType != null">
+                    da_deal_type = #{item.daDealType},
+                </if>
+                <if test="item.daStartDate != null">
+                    da_start_date = #{item.daStartDate},
+                </if>
+                <if test="item.daItemName != null">
+                    da_item_name = #{item.daItemName},
+                </if>
+                <if test="item.daStatus != null">
+                    da_status = #{item.daStatus},
+                </if>
+                <if test="item.daStopDate != null">
+                    da_stop_date = #{item.daStopDate},
+                </if>
+                <if test="item.daGroupNo != null">
+                    da_group_no = #{item.daGroupNo},
+                </if>
+                <if test="item.daPrescriptionType != null">
+                    da_prescription_type = #{item.daPrescriptionType},
+                </if>
+                <if test="item.daMedType != null">
+                    da_med_type = #{item.daMedType},
+                </if>
+                <if test="item.doctorNotice != null">
+                    doctor_notice = #{item.doctorNotice},
+                </if>
+                <if test="item.doctorId != null">
+                    doctor_id = #{item.doctorId},
+                </if>
+                <if test="item.doctorName != null">
+                    doctor_name = #{item.doctorName},
+                </if>
+                <if test="item.medicineType != null">
+                    medicine_type = #{item.medicineType},
+                </if>
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where doctor_advice_id = #{item.doctorAdviceId} and hospital_id = #{item.hospitalId} and behospital_code = #{item.behospitalCode}
+        </foreach>
     </update>
+
 </mapper>

src/main/resources/mapper/MedRecordTypeMapper.xml

@@ -34,6 +34,12 @@
                 <if test="item.spell != null">
                     spell = #{item.spell},
                 </if>
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
             </set>
             where type_id = #{item.typeId} and hospital_id = #{item.hospitalId}
         </foreach>

src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -10,6 +10,9 @@
         <result column="mode_id" property="modeId" />
         <result column="code" property="code" />
         <result column="name" property="name" />
+        <result column="rule_type" property="ruleType" />
+        <result column="dev_type" property="devType" />
+        <result column="accuracy_type" property="accuracyType" />
         <result column="precond" property="precond" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />

src/main/resources/mapper/SysUserPagesetMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.SysUserPagesetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysUserPageset">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="user_id" property="userId" />
+        <result column="page_type" property="pageType" />
+        <result column="name" property="name" />
+        <result column="order_no" property="orderNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

src/test/java/com/diagbot/CodeGeneration.java

@@ -33,7 +33,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
+        gc.setAuthor("gaodm");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");
@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "med_crisis_info"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_doctor_advice"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);