Merge remote-tracking branch 'origin/dev/20200618_1.3.6' into dev/20200619_1.3.6.1

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

doc/010.20200617v1.3.5/qc_initv1.3.5.sql

@@ -1,9 +1,34 @@
 use `qc`;
 -- 技术服务部已执行
 -- ALTER TABLE `qc`.`bas_doctor_info` ADD COLUMN `group_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小组id' AFTER `occup`;
+-- alter table `med_home_page` modify column `outpatient_emr_diagnose` varchar(500) DEFAULT NULL COMMENT '门急诊诊断';
+-- alter table `med_home_page` modify column `qc_nurse` varchar(255) DEFAULT NULL COMMENT '质控护士';
+-- alter table `med_home_page` modify column `encode_man` varchar(255) DEFAULT NULL COMMENT '编码员';
+-- alter table `med_home_page` modify column `dept_director` varchar(255) DEFAULT NULL COMMENT '科主任';
+-- alter table `med_home_page` modify column `cur_post_code` varchar(255) DEFAULT NULL COMMENT '现住址邮编';
+-- alter table `med_home_page` modify column `pathology_diagnose_id` varchar(255) DEFAULT NULL COMMENT '病理诊断编号';
+-- alter table `med_home_page` modify column `director_doctor` varchar(255) DEFAULT NULL COMMENT '主任医师';
+-- alter table `med_home_page` modify column `cur_phone` varchar(255) DEFAULT NULL COMMENT '现住址电话';
+-- alter table `med_home_page` modify column `leave_hospital_dept` varchar(255) DEFAULT NULL COMMENT '出院科别';
+-- alter table `med_home_page` modify column `response_nurse` varchar(255) DEFAULT NULL COMMENT '责任护士';
 
 -- UPDATE `sys_permission` SET is_deleted = 'Y' WHERE permissionUrl LIKE '/console%' AND is_deleted='N';
 
 -- UPDATE sys_menu_permission SET is_deleted='Y' where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
 
 -- UPDATE sys_role_permission SET is_deleted='Y'where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
+
+-- 新增权限
+INSERT INTO `sys_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES (94, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（全院）', 'FUNC000094', '/console/qcResultShortPage', 'ALL', '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）', NULL);
+INSERT INTO `sys_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES (95, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（科室）', 'FUNC000095', '/consoleByDept/qcResultShortByDeptPage', 'ALL', '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）', NULL);
+INSERT INTO `sys_role_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES (1623, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 94, '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
+INSERT INTO `sys_role_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES (1624, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -1, 95, '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
+INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (66, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, 94, '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
+INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (67, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 27, 95, '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
+
+
+ALTER TABLE `med_behospital_info` ADD INDEX `idx_beh_dept_id` (`beh_dept_id`) USING BTREE;
+
+-- 所有环境、技术服务部已经同步
+-- DROP INDEX advice_behospital_code_unique ON med_doctor_advice;
+-- ALTER TABLE med_doctor_advice ADD UNIQUE KEY `advice_behospital_code_unique` (`doctor_advice_id`,`hospital_id`,`behospital_code`) USING BTREE;

doc/010.20200618v1.3.6/qc_initv1.3.6.sql

@@ -1,272 +1,12 @@
 use `qc`;
 
-DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE `sys_menu` (
-  `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则表示纪录未修改',
-  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单名称',
-  `parent_id` bigint(20) NOT NULL DEFAULT '-1' COMMENT '-1：表示顶级,其他值表示上级菜单的id',
-  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '编码，与前端对应',
-  `show_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否在右侧菜单显示(0:不显示，1：显示)',
-  `maintain_status` int(11) NOT NULL DEFAULT '0' COMMENT '是否可以维护(0:不可维护，1：可以维护)',
-  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序，从小到大',
-  `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 COMMENT='系统菜单';
-
-INSERT INTO `sys_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台', '-1', 'YH-KZT', '1', '1', '-10', '用户-控制台');
-INSERT INTO `sys_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '基础数据维护', '-1', 'YH-JCSJWH', '1', '1', '2', '用户-基础数据维护');
-INSERT INTO `sys_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案质控', '-1', 'YH-BLZK', '1', '1', '3', '用户-病历质控');
-INSERT INTO `sys_menu` VALUES ('4', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '统计分析', '-1', 'YH-TJFX', '1', '1', '4', '用户-统计分析');
-INSERT INTO `sys_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模块数据维护', '2', 'YH-JCSJWH-MKSJWH', '1', '1', '1', '用户-基础数据维护-模块数据维护');
-INSERT INTO `sys_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目数据维护', '2', 'YH-JCSJWH-TMSJWH', '1', '1', '2', '用户-基础数据维护-条目数据维护');
-INSERT INTO `sys_menu` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分', '3', 'YH-BLZK-ZKPF', '1', '1', '1', '用户-病历质控-质控评分');
-INSERT INTO `sys_menu` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '基础功能', '-1', 'YH-QBYH-JCGN', '0', '1', '0', '用户-基础功能');
-INSERT INTO `sys_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分(科室)', '3', 'YH-BLZK-ZKPFKS', '1', '1', '2', '用户-病历质控-质控评分(科室)');
-INSERT INTO `sys_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分(个人)', '3', 'YH-BLZK-ZKPFGR', '1', '1', '3', '用户-病历质控-质控评分(个人)');
-INSERT INTO `sys_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '权限管理', '-1', 'YH-QXGL', '1', '0', '5', '用户-权限管理');
-INSERT INTO `sys_menu` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户管理', '12', 'YH-QXGL-YHGL', '1', '0', '1', '用户-权限管理-用户管理');
-INSERT INTO `sys_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '角色管理', '12', 'YH-QXGL-JSGL', '1', '0', '2', '用户-权限管理-角色管理');
-INSERT INTO `sys_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '控制台(科室)', '-1', 'YH-KZTKS', '1', '1', '-9', '用户-控制台（科室）');
-INSERT INTO `sys_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '异常数据监控', '-1', 'YH-YCSJJK', '1', '0', '10', '用户-异常数据监控');
-INSERT INTO `sys_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '数据报表明细', '-1', 'YH-ZKK', '1', '1', '-8', '用户-质控科');
-INSERT INTO `sys_menu` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '数据报表明细(科室)', '-1', 'YH-KSZR', '1', '1', '-7', '用户-科室主任');
-INSERT INTO `sys_menu` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比', '17', 'YH-ZKK-GMKQXZB_XQ', '1', '1', '2', '用户-质控科-各模块缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比', '17', 'YH-ZKK-TMQXZB_XQ', '1', '1', '3', '用户-质控科-条目缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室平均住院天数', '17', 'YH-ZKK-KSPJZYTS_XQ', '1', '1', '4', '用户-质控科-科室平均住院天数_详情');
-INSERT INTO `sys_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室平均住院花费', '17', 'YH-ZKK-KSPJZYHF_XQ', '1', '1', '5', '用户-质控科-科室平均住院花费_详情');
-INSERT INTO `sys_menu` VALUES ('23', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室质控平均分', '17', 'YH-ZKK-GKSZKPJF_XQ', '1', '1', '6', '用户-质控科-各科室质控平均分_详情');
-INSERT INTO `sys_menu` VALUES ('24', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '缺陷详情', '17', 'YH-ZKK-GKSQXZB', '1', '1', '7', '用户-质控科-各科室缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室甲级病历占比', '17', 'YH-ZKK-GKSJJBLZB_XQ', '1', '1', '8', '用户-质控科-各科室甲级病历占比_详情');
-INSERT INTO `sys_menu` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比', '18', 'YH-KSZR-GMKQXZB_XQ', '1', '1', '2', '用户-科室主任-各模块缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比', '18', 'YH-KSZR-TMQXZB_XQ', '1', '1', '3', '用户-科室主任-条目缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比', '17', 'YH-ZKK-BASYHGLZB_XQ', '1', '1', '1', '用户-质控科-病案首页合格率占比_详情');
-INSERT INTO `sys_menu` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比', '18', 'YH-KSZR-BASYHGLZB_XQ', '1', '1', '1', '用户-科室主任-病案首页合格率占比_详情');
-INSERT INTO `sys_menu` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室缺陷占比', '18', 'YH-KSZR-KSQXZB_XQ', '1', '1', '4', '用户-科室主任-科室缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比', '17', 'YH-ZKK-GKSQXZB_XQ', '1', '1', '9', '用户-质控科-各科室缺陷占比_详情');
-INSERT INTO `sys_menu` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控类型维护', '2', 'YH-JCSJWH-ZKLXWH', '1', '0', '3', '用户-基础数据维护-质控类型维护');
 INSERT INTO `sys_menu` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分(医疗组)', '3', 'YH-BLZK-ZKPFYLZ', '1', '1', '4', '用户-病历质控-质控评分(医疗组)');
 
-DROP TABLE IF EXISTS `sys_menu_permission`;
-CREATE TABLE `sys_menu_permission` (
-  `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则表示纪录未修改',
-  `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
-  `permission_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '系统资源id',
-  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=72 DEFAULT CHARSET=utf8 COMMENT='菜单和系统资源的映射表';
-
-INSERT INTO `sys_menu_permission` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '1', '基础功能-获取用户、机构、菜单信息');
-INSERT INTO `sys_menu_permission` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '2', '基础功能-修改密码');
-INSERT INTO `sys_menu_permission` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '控制台-病历相关统计');
-INSERT INTO `sys_menu_permission` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '15', '控制台-缺陷相关统计');
-INSERT INTO `sys_menu_permission` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '16', '控制台-医院运营相关统计');
-INSERT INTO `sys_menu_permission` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '3', '用户-基础数据维护-获取医院模块数据信息');
-INSERT INTO `sys_menu_permission` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '4', '用户-基础数据维护-批量更新模块数据');
-INSERT INTO `sys_menu_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '6', '用户-条目数据维护-分页获取医院条目数据信息');
-INSERT INTO `sys_menu_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '7', '用户-条目数据维护-修改医院条目数据信息');
-INSERT INTO `sys_menu_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '8', '用户-条目数据维护-获取医院模块数据下拉列表');
-INSERT INTO `sys_menu_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '30', '用户-质控评分-获取病历质控一览下医院科室下拉列表信息');
-INSERT INTO `sys_menu_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '17', '用户-质控评分-评分');
-INSERT INTO `sys_menu_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '5', '用户-质控评分-分页');
-INSERT INTO `sys_menu_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '11', '用户-质控评分-新增质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '12', '用户-质控评分-删除质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '13', '用户-质控评分-修改质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '14', '用户-质控评分-获取详情');
-INSERT INTO `sys_menu_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '31', '用户-质控评分(科室)-获取病历质控一览下用户科室下拉列表信息');
-INSERT INTO `sys_menu_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '34', '用户-质控评分(科室)-评分');
-INSERT INTO `sys_menu_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '32', '用户-质控评分(科室)-分页');
-INSERT INTO `sys_menu_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '35', '用户-质控评分(科室)-新增质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '36', '用户-质控评分(科室)-删除质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '37', '用户-质控评分(科室)-修改质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '38', '用户-质控评分(科室)-获取详情');
-INSERT INTO `sys_menu_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '39', '用户-质控评分(个人)-获取病历质控一览下用户科室下拉列表信息');
-INSERT INTO `sys_menu_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '40', '用户-质控评分(个人)-评分');
-INSERT INTO `sys_menu_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '33', '用户-质控评分(个人)-分页');
-INSERT INTO `sys_menu_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '41', '用户-质控评分(个人)-新增质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '42', '用户-质控评分(个人)-删除质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '43', '用户-质控评分(个人)-修改质控条目');
-INSERT INTO `sys_menu_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '44', '用户-质控评分(个人)-获取详情');
-INSERT INTO `sys_menu_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '控制台-平均住院天数');
-INSERT INTO `sys_menu_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '46', '控制台-平均住院费用');
-INSERT INTO `sys_menu_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '47', '控制台-质控平均分按科室统计');
-INSERT INTO `sys_menu_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '48', '控制台-各科室甲级病历占比');
-INSERT INTO `sys_menu_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '49', '控制台-出院人数统计');
-INSERT INTO `sys_menu_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '50', '控制台-质控病历统计');
-INSERT INTO `sys_menu_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '51', '控制台-各模块缺陷占比排行');
-INSERT INTO `sys_menu_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '52', '控制台-条目缺陷占比');
-INSERT INTO `sys_menu_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '53', '控制台-各科室缺陷占比');
-INSERT INTO `sys_menu_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '54', '控制台（科室）-出院人数统计（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '55', '控制台（科室）-质控病历数统计（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '56', '控制台（科室）-各模块缺陷占比排行（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '57', '控制台（科室）-条目缺陷占比（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '58', '控制台（科室）-查询用户关联科室');
-INSERT INTO `sys_menu_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '59', '控制台-各模块缺陷占比_详情');
-INSERT INTO `sys_menu_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '60', '控制台-条目缺陷占比_详情');
-INSERT INTO `sys_menu_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '21', '64', '控制台-科室平均住院天数_详情');
-INSERT INTO `sys_menu_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '22', '65', '控制台-科室平均住院花费_详情');
-INSERT INTO `sys_menu_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '66', '控制台-各科室质控平均分_详情');
-INSERT INTO `sys_menu_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '67', '控制台-各科室缺陷占比-缺陷详情');
-INSERT INTO `sys_menu_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '25', '68', '控制台-各科室甲级病历占比_详情');
-INSERT INTO `sys_menu_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '26', '69', '控制台（科室）-各模块缺陷占比_详情');
-INSERT INTO `sys_menu_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '70', '控制台（科室）-条目缺陷占比_详情');
-INSERT INTO `sys_menu_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '71', '控制台-各科室缺陷占比（组合）');
-INSERT INTO `sys_menu_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '28', '72', '控制台-病案首页合格率占比');
-INSERT INTO `sys_menu_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '73', '控制台（科室）-各科室缺陷占比（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '29', '74', '控制台（科室）-病案首页合格率占比（科室）');
-INSERT INTO `sys_menu_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '75', '控制台-病案首页合格率占比（首页）');
-INSERT INTO `sys_menu_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '76', '控制台（科室）-病案首页合格率占比（首页）');
-INSERT INTO `sys_menu_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '77', '控制台（科室）-科室缺陷占比-缺陷明细');
-INSERT INTO `sys_menu_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '89', '控制台-条目缺陷占比（内页）');
-INSERT INTO `sys_menu_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '90', '控制台（科室）-条目缺陷占比-科室（内页）');
-INSERT INTO `sys_menu_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '91', '控制台-各科室质控平均分（首页）-根据内外科系统统计');
-INSERT INTO `sys_menu_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '31', '92', '控制台-各科室缺陷占比（内页）-根据内外科系统统计');
-INSERT INTO `sys_menu_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '94', '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
-INSERT INTO `sys_menu_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '27', '95', '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
 INSERT INTO `sys_menu_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '96', '用户-医疗组-分页');
 INSERT INTO `sys_menu_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '97', '用户-医疗组-新增质控条目');
 INSERT INTO `sys_menu_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '98', '用户-医疗组-删除质控条目');
 INSERT INTO `sys_menu_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '33', '99', '用户-医疗组-修改质控条目');
 
-DROP TABLE IF EXISTS `sys_permission`;
-CREATE TABLE `sys_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '资源ID',
-  `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则表示纪录未修改',
-  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '资源名称',
-  `code` varchar(20) NOT NULL DEFAULT '' COMMENT '资源编码',
-  `permissionUrl` varchar(255) NOT NULL DEFAULT '' COMMENT '资源Url',
-  `method` varchar(255) NOT NULL DEFAULT 'ALL' COMMENT '资源允许的请求方式',
-  `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '资源描述',
-  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8 COMMENT='系统资源表';
-
-INSERT INTO `sys_permission` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户、机构、菜单信息', 'FUNC000001', '/sys/user/getUserOrgMenu', 'ALL', '基础功能-获取用户、机构、菜单信息', null);
-INSERT INTO `sys_permission` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改密码', 'FUNC000002', '/sys/user/midifyPassword', 'ALL', '基础功能-修改密码', null);
-INSERT INTO `sys_permission` VALUES ('3', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院模块数据信息', 'FUNC000003', '/qc/cases/getQcCases', 'ALL', '用户-基础数据维护-获取医院模块数据信息', '无需加密');
-INSERT INTO `sys_permission` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改医院模块数据', 'FUNC000004', '/qc/cases/saveQcCases', 'ALL', '用户-基础数据维护-修改医院模块数据', null);
-INSERT INTO `sys_permission` VALUES ('5', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分页查询', 'FUNC000005', '/qc/behospitalInfo/page', 'ALL', '用户-质控评分-分页', '无需加密');
-INSERT INTO `sys_permission` VALUES ('6', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分页获取医院条目数据信息', 'FUNC000006', '/qc/casesEntryHospital/getQcCasesEntryAll', 'ALL', '用户-条目数据维护-分页获取医院条目数据信息', '无需加密');
-INSERT INTO `sys_permission` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改医院条目数据信息', 'FUNC000007', '/qc/casesEntryHospital/updataQcCasesEntry', 'ALL', '用户-条目数据维护-修改医院条目数据信息', null);
-INSERT INTO `sys_permission` VALUES ('8', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院模块下拉数据列表', 'FUNC000008', '/qc/casesEntryHospital/getQcCasesAll', 'ALL', '获取医院模块数据列表', '无需加密');
-INSERT INTO `sys_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病历相关统计', 'FUNC000009', '/console/mrStatistics', 'ALL', '控制台-病历相关统计', null);
-INSERT INTO `sys_permission` VALUES ('10', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '模糊查询医院模块条目列表', 'FUNC000010', '/qc/casesEntryHospital/findQcCasesEntry', 'ALL', '用户-条目数据维护-模糊查询医院模块条目列表', null);
-INSERT INTO `sys_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增质控条目', 'FUNC000011', '/qc/behospitalInfo/addCase', 'ALL', '用户-质控评分-新增质控条目', null);
-INSERT INTO `sys_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除质控条目', 'FUNC000012', '/qc/behospitalInfo/delCase', 'ALL', '用户-质控评分-删除质控条目', null);
-INSERT INTO `sys_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改质控条目', 'FUNC000013', '/qc/behospitalInfo/updCase', 'ALL', '用户-质控评分-修改质控条目', null);
-INSERT INTO `sys_permission` VALUES ('14', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取质控评分详情', 'FUNC000014', '/qc/behospitalInfo/getByBehospitalCode', 'ALL', '用户-质控评分-获取详情', '无需加密');
-INSERT INTO `sys_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '缺陷相关统计', 'FUNC000015', '/console/resultStatistics', 'ALL', '控制台-缺陷相关统计', null);
-INSERT INTO `sys_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '平均值相关统计', 'FUNC000016', '/console/averageStatistics', 'ALL', '控制台-平均值相关统计', null);
-INSERT INTO `sys_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分', 'FUNC000017', '/qc/behospitalInfo/analyze', 'ALL', '用户-质控评分-评分', null);
-INSERT INTO `sys_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取角色列表信息', 'FUNC000018', '/sys/role/list', 'ALL', '用户-权限管理-角色管理-获取角色列表信息', null);
-INSERT INTO `sys_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取角色菜权限单等数据', 'FUNC000019', '/sys/role/getRoleMenu', 'ALL', '用户-权限管理-角色管理-获取角色菜权限单等数据', null);
-INSERT INTO `sys_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改角色菜单权限数据', 'FUNC000020', '/sys/role/saveRoleMenu', 'ALL', '用户-权限管理-角色管理-修改角色菜单权限数据', null);
-INSERT INTO `sys_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院科室下拉列表信息', 'FUNC000021', '/bas/dept/listForUser', 'ALL', '用户-权限管理-用户管理-获取用户管理下医院科室下拉列表信息', null);
-INSERT INTO `sys_permission` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取角色下拉列表信息', 'FUNC000022', '/sys/role/listForUser', 'ALL', '用户-权限管理-用户管理-获取角色下拉列表信息', null);
-INSERT INTO `sys_permission` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户列表翻页信息查询', 'FUNC000023', '/sys/user/userPage', 'ALL', '用户-权限管理-用户管理-用户列表翻页信息查询', null);
-INSERT INTO `sys_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户科室', 'FUNC000024', '/sys/user/getUserDepts', 'ALL', '用户-权限管理-用户管理-获取用户科室', null);
-INSERT INTO `sys_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户角色', 'FUNC000025', '/sys/user/getUserRoles', 'ALL', '用户-权限管理-用户管理-获取用户角色', null);
-INSERT INTO `sys_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户启用', 'FUNC000026', '/sys/user/enable', 'ALL', '用户-权限管理-用户管理-用户启用', null);
-INSERT INTO `sys_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '用户停用', 'FUNC000027', '/sys/user/disable', 'ALL', '用户-权限管理-用户管理-用户停用', null);
-INSERT INTO `sys_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '编辑用户科室', 'FUNC000028', '/sys/user/editUserDepts', 'ALL', '用户-权限管理-用户管理-编辑用户科室', null);
-INSERT INTO `sys_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '编辑用户角色', 'FUNC000029', '/sys/user/editUserRoles', 'ALL', '用户-权限管理-用户管理-编辑用户角色', null);
-INSERT INTO `sys_permission` VALUES ('30', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院科室下拉列表信息', 'FUNC000030', '/bas/dept/getList', 'ALL', '用户-质控评分-获取病历质控一览下医院科室下拉列表信息', '无需加密');
-INSERT INTO `sys_permission` VALUES ('31', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户科室下拉列表信息', 'FUNC000031', '/bas/dept/getListUser', 'ALL', '用户-质控评分(科室)-获取病历质控一览下用户科室下拉列表信息', '无需加密');
-INSERT INTO `sys_permission` VALUES ('32', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分页查询', 'FUNC000032', '/qc/behospitalInfo/page_dept', 'ALL', '用户-质控评分(科室)-分页', '无需加密');
-INSERT INTO `sys_permission` VALUES ('33', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分页查询', 'FUNC000033', '/qc/behospitalInfo/page_person', 'ALL', '用户-质控评分(个人)-分页', '无需加密');
-INSERT INTO `sys_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分', 'FUNC000017', '/qc/behospitalInfo/analyze', 'ALL', '用户-质控评分(科室)-评分', null);
-INSERT INTO `sys_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增质控条目', 'FUNC000011', '/qc/behospitalInfo/addCase', 'ALL', '用户-质控评分(科室)-新增质控条目', null);
-INSERT INTO `sys_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除质控条目', 'FUNC000012', '/qc/behospitalInfo/delCase', 'ALL', '用户-质控评分(科室)-删除质控条目', null);
-INSERT INTO `sys_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改质控条目', 'FUNC000013', '/qc/behospitalInfo/updCase', 'ALL', '用户-质控评分(科室)-修改质控条目', null);
-INSERT INTO `sys_permission` VALUES ('38', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取质控评分详情', 'FUNC000014', '/qc/behospitalInfo/getByBehospitalCode', 'ALL', '用户-质控评分(科室)-获取详情', '无需加密');
-INSERT INTO `sys_permission` VALUES ('39', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取用户科室下拉列表信息', 'FUNC000031', '/bas/dept/getListUser', 'ALL', '用户-质控评分(个人)-获取病历质控一览下用户科室下拉列表信息', '无需加密');
-INSERT INTO `sys_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分', 'FUNC000017', '/qc/behospitalInfo/analyze', 'ALL', '用户-质控评分(个人)-评分', null);
-INSERT INTO `sys_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增质控条目', 'FUNC000011', '/qc/behospitalInfo/addCase', 'ALL', '用户-质控评分(个人)-新增质控条目', null);
-INSERT INTO `sys_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除质控条目', 'FUNC000012', '/qc/behospitalInfo/delCase', 'ALL', '用户-质控评分(个人)-删除质控条目', null);
-INSERT INTO `sys_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '修改质控条目', 'FUNC000013', '/qc/behospitalInfo/updCase', 'ALL', '用户-质控评分(个人)-修改质控条目', null);
-INSERT INTO `sys_permission` VALUES ('44', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取质控评分详情', 'FUNC000014', '/qc/behospitalInfo/getByBehospitalCode', 'ALL', '用户-质控评分(个人)-获取详情', '无需加密');
-INSERT INTO `sys_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '平均住院天数', 'FUNC000045', '/console/getAverageDayNum', 'ALL', '控制台-平均住院天数', null);
-INSERT INTO `sys_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '平均住院费用', 'FUNC000046', '/console/getAverageFee', 'ALL', '控制台-平均住院费用', null);
-INSERT INTO `sys_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控平均分按科室统计', 'FUNC000047', '/console/getAverageScore', 'ALL', '控制台-质控平均分按科室统计', null);
-INSERT INTO `sys_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室甲级病历占比', 'FUNC000048', '/console/getLevelResultDept', 'ALL', '控制台-各科室甲级病历占比', null);
-INSERT INTO `sys_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '出院人数统计', 'FUNC000049', '/console/leaveHosCount', 'ALL', '控制台-出院人数统计', null);
-INSERT INTO `sys_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控病历统计', 'FUNC000050', '/console/mrCount', 'ALL', '控制台-质控病历统计', null);
-INSERT INTO `sys_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比排行', 'FUNC000051', '/console/entryCountGroupByCase', 'ALL', '控制台-各模块缺陷占比排行', null);
-INSERT INTO `sys_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比', 'FUNC000052', '/console/entryCountGroupByEntry', 'ALL', '控制台-条目缺陷占比', null);
-INSERT INTO `sys_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比', 'FUNC000053', '/console/entryByDept', 'ALL', '控制台-各科室缺陷占比', null);
-INSERT INTO `sys_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '出院人数统计（科室）', 'FUNC000054', '/consoleByDept/leaveHosCountByDept', 'ALL', '控制台（科室）-出院人数统计（科室）', null);
-INSERT INTO `sys_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控病历数统计（科室）', 'FUNC000055', '/consoleByDept/mrCountByDept', 'ALL', '控制台（科室）-质控病历数统计（科室）', null);
-INSERT INTO `sys_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比排行（科室）', 'FUNC000056', '/consoleByDept/entryCountGroupByCaseAndDept', 'ALL', '控制台（科室）-各模块缺陷占比排行（科室）', null);
-INSERT INTO `sys_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比（科室）', 'FUNC000057', '/consoleByDept/entryCountGroupByEntryAndDept', 'ALL', '控制台（科室）-条目缺陷占比（科室）', null);
-INSERT INTO `sys_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询用户关联科室', 'FUNC000058', '/consoleByDept/getDept', 'ALL', '控制台（科室）-查询用户关联科室', null);
-INSERT INTO `sys_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比_详情', 'FUNC000059', '/console/entryCountGroupByCasePage', 'ALL', '控制台-各模块缺陷占比_详情', null);
-INSERT INTO `sys_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比_详情', 'FUNC000060', '/console/entryCountGroupByEntryPage', 'ALL', '控制台-条目缺陷占比_详情', null);
-INSERT INTO `sys_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '查询异常数据监控信息', 'FUNC000061', '/qc/abnormal/getQcAnnormal', 'ALL', '异常数据监控-查询异常数据监控信息', null);
-INSERT INTO `sys_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '更新异常数据监控信息', 'FUNC000062', '/qc/abnormal/saveQcAnnormal', 'ALL', '异常数据监控-异常数据监控-查询异常数据监控信息', null);
-INSERT INTO `sys_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除异常数据监控信息', 'FUNC000063', '/qc/abnormal/delQcAnnormal', 'ALL', '异常数据监控-异常数据监控-删除异常数据监控信息', null);
-INSERT INTO `sys_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室平均住院天数_详情', 'FUNC000064', '/console/getAverageDayNumPage', 'ALL', '控制台-科室平均住院天数_详情', null);
-INSERT INTO `sys_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室平均住院花费_详情', 'FUNC000065', '/console/getAverageFeePage', 'ALL', '控制台-科室平均住院花费_详情', null);
-INSERT INTO `sys_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室质控平均分_详情', 'FUNC000066', '/console/getAverageScoreByDeptPage', 'ALL', '控制台-各科室质控平均分_详情', null);
-INSERT INTO `sys_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比-缺陷详情', 'FUNC000067', '/console/resultStatisticsByDeptPage', 'ALL', '控制台-各科室缺陷占比-缺陷详情', null);
-INSERT INTO `sys_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室甲级病历占比_详情', 'FUNC000068', '/console/levelPercentGroupByDeptPage', 'ALL', '控制台-各科室甲级病历占比_详情', null);
-INSERT INTO `sys_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各模块缺陷占比_详情', 'FUNC000069', '/consoleByDept/entryCountGroupByCaseAndDeptPage', 'ALL', '控制台（科室）-各模块缺陷占比_详情', null);
-INSERT INTO `sys_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比_详情', 'FUNC000070', '/consoleByDept/entryCountGroupByEntryAndDeptPage', 'ALL', '控制台（科室）-条目缺陷占比_详情', null);
-INSERT INTO `sys_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比（组合）', 'FUNC000071', '/console/levelStatistics', 'ALL', '控制台-各科室缺陷占比（组合）', null);
-INSERT INTO `sys_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比', 'FUNC000072', '/console/homePageLevelStatistics', 'ALL', '控制台-病案首页合格率占比', null);
-INSERT INTO `sys_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比', 'FUNC000073', '/consoleByDept/levelStatisticsByDept', 'ALL', '控制台（科室）-各科室缺陷占比（科室）', null);
-INSERT INTO `sys_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比', 'FUNC000074', '/consoleByDept/homePageLevelStatisticsByDept', 'ALL', '控制台（科室）-病案首页合格率占比（科室）', null);
-INSERT INTO `sys_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比（首页）', 'FUNC000075', '/console/homePageLevelLimit', 'ALL', '控制台-病案首页合格率占比（首页）', null);
-INSERT INTO `sys_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '病案首页合格率占比（首页）', 'FUNC000076', '/consoleByDept/homePageLevelByDeptLimit', 'ALL', '控制台（科室）-病案首页合格率占比（首页）', null);
-INSERT INTO `sys_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室缺陷占比-缺陷明细', 'FUNC000077', '/consoleByDept/resultStatisticsByDeptAndDoctorPage', 'ALL', '控制台（科室）-科室缺陷占比-缺陷明细', null);
-INSERT INTO `sys_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '分页列表', 'FUNC000078', '/qc/qcType/page', 'ALL', '用户-质控类型维护-分页列表', null);
-INSERT INTO `sys_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增或更新', 'FUNC000079', '/qc/qcType/saveOrUpdate', 'ALL', '用户-质控类型维护-新增或更新', null);
-INSERT INTO `sys_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增时质控条目分组信息', 'FUNC000080', '/qc/qcType/getEntryByHospital', 'ALL', '用户-质控类型维护-新增时质控条目分组信息', null);
-INSERT INTO `sys_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控条目检索', 'FUNC000081', '/qc/qcType/index', 'ALL', '用户-质控类型维护-质控条目检索', null);
-INSERT INTO `sys_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除', 'FUNC000082', '/qc/qcType/delete', 'ALL', '用户-质控类型维护-删除', null);
-INSERT INTO `sys_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据id返回内容', 'FUNC000083', '/qc/qcType/getById', 'ALL', '用户-质控类型维护-根据id返回内容', null);
-INSERT INTO `sys_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院数据全部条目', 'FUNC000084', '/qc/modelHospital/getModelHospitalAll', 'ALL', '用户-质控类型维护-获取医院数据全部条目', null);
-INSERT INTO `sys_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据id获取医院数据', 'FUNC000085', '/qc/modelHospital/getModelHospitalById', 'ALL', '用户-质控类型维护-根据id获取医院数据', null);
-INSERT INTO `sys_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '添加和修改医院数据模块', 'FUNC000086', '/qc/modelHospital/saveAndupdataModel', 'ALL', '用户-质控类型维护-添加和修改医院数据模块', null);
-INSERT INTO `sys_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除医院数据模块', 'FUNC000087', '/qc/modelHospital/clearModelHospital', 'ALL', '用户-质控类型维护-删除医院数据模块', null);
-INSERT INTO `sys_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '获取医院全部模块', 'FUNC0000888', '/qc/mode/getModes', 'ALL', '用户-质控类型维护-获取医院全部模块', null);
-INSERT INTO `sys_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比（内页）', 'FUNC000089', '/console/entryGroupByEntryInnerPage', 'ALL', '控制台-条目缺陷占比（内页）', null);
-INSERT INTO `sys_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比-科室（内页）', 'FUNC000090', '/consoleByDept/entryGroupByEntryAndDeptInnerPage', 'ALL', '控制台（科室）-条目缺陷占比-科室（内页）', null);
-INSERT INTO `sys_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室质控平均分（首页）-根据内外科系统统计', 'FUNC000091', '/console/getAverageScoreByDeptClass', 'ALL', '控制台-各科室质控平均分（首页）-根据内外科系统统计', null);
-INSERT INTO `sys_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '各科室缺陷占比（内页）-根据内外科系统统计', 'FUNC000092', '/console/levelStatisticsByDeptClass', 'ALL', '控制台-各科室缺陷占比（内页）-根据内外科系统统计', null);
-INSERT INTO `sys_permission` VALUES ('93', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据id查询数据模块信息', 'FUNC000093', '/qc/abnormal/getQcAnnormalMode', 'ALL', '异常数据监控-异常数据监控-根据id查询数据模块信息', null);
-INSERT INTO `sys_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（全院）', 'FUNC000094', '/console/qcResultShortPage', 'ALL', '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）', null);
-INSERT INTO `sys_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '条目缺陷占比质控详情页（科室）', 'FUNC000095', '/consoleByDept/qcResultShortByDeptPage', 'ALL', '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）', null);
 INSERT INTO `sys_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控评分', 'FUNC000017', '/qc/behospitalInfo/analyze', 'ALL', '用户-医疗组-评分', null);
 INSERT INTO `sys_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '新增质控条目', 'FUNC000011', '/qc/behospitalInfo/addCase', 'ALL', '用户-医疗组-新增质控条目', null);
 INSERT INTO `sys_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '删除质控条目', 'FUNC000012', '/qc/behospitalInfo/delCase', 'ALL', '用户-医疗组-删除质控条目', null);
@@ -278,4 +18,11 @@ INSERT INTO `sys_role_menu` (`is_deleted`, `gmt_create`, `gmt_modified`, `creato
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '96', NULL);
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '97', NULL);
 INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '98', NULL);
-INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '99', NULL);
+INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '99', NULL);
+
+
+-- 再次同步
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_hospital_id` (`hospital_id`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_is_deleted` (`is_deleted`) USING BTREE;
+-- ALTER TABLE `med_qcresult_info` ADD INDEX `idx_mix` (`hospital_id`,`behospital_code`,`is_deleted`) USING BTREE;

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

@@ -38,6 +38,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
                 .antMatchers("/sys/user/getJwt").permitAll()
+                .antMatchers("/sys/user/getJwtNoPass").permitAll()
                 .antMatchers("/sys/user/refreshJwt").permitAll()
                 .antMatchers("/sys/user/checkToken").permitAll()
                 .antMatchers("/sys/dictionaryInfo/getDictionary").permitAll()
@@ -116,6 +117,20 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/entryGroupByEntryExport").permitAll()
                 .antMatchers("/console/export/levelExport").permitAll()
                 .antMatchers("/console/entryStatistics").permitAll()
+                .antMatchers("/console/export/levelExport_TZ").permitAll()
+                .antMatchers("/qc/data/sendDoctorInfos").permitAll()
+                .antMatchers("/qc/data/sendDeptInfos").permitAll()
+                .antMatchers("/qc/data/sendRecordTypes").permitAll()
+                .antMatchers("/qc/data/sendMrRecordIng").permitAll()
+                .antMatchers("/qc/data/sendMrContent").permitAll()
+                .antMatchers("/qc/data/sendMrRecord").permitAll()
+                .antMatchers("/qc/data/sendPatientInfo").permitAll()
+                .antMatchers("/qc/data/sendDoctorAdvice").permitAll()
+                .antMatchers("/qc/data/sendHomePageIng").permitAll()
+                .antMatchers("/qc/data/sendHomePage").permitAll()
+                .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
+                .antMatchers("/qc/data/sendHomeOperation").permitAll()
+                .antMatchers("/qc/data/sendCrisis").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -81,6 +81,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
                 || matchers("/sys/user/getJwt", request)
+                || matchers("/sys/user/getJwtNoPass", request)
                 || matchers("/sys/user/refreshJwt", request)
                 || matchers("/sys/dictionaryInfo/getDictionary", request)
                 || matchers("/sys/user/checkToken", request)
@@ -159,6 +160,20 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/entryGroupByEntryExport", request)
                 || matchers("/console/export/levelExport", request)
                 || matchers("/console/entryStatistics", request)
+                || matchers("/console/export/levelExport_TZ", 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("/", request)) {
             return true;
         }

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

@@ -15,7 +15,7 @@ public class LevelStatisticsDTO {
     /**
      * 科室id（科室编码）
      */
-    @Excel(name = "科室编码", orderNum = "1")
+    @Excel(name = "科室编码", orderNum = "0")
     private String deptId;
     /**
      * 科室名称
@@ -91,12 +91,4 @@ public class LevelStatisticsDTO {
      */
     @Excel(name = "丙级率", orderNum = "11")
     private String thirdLevelPercentStr;
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    private String deptClass;
 }

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

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

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

@@ -100,12 +100,42 @@ public class ABehospitalInfoDTO{
     private String diagnose;
 
     /**
-     * 医生ID
+     * 住院医生ID
+     */
+    private String behDoctorId;
+
+    /**
+     * 住院医生姓名
+     */
+    private String behDoctorName;
+
+    /**
+     * 主治医生ID
      */
     private String doctorId;
 
     /**
-     * 医生姓名
+     * 主治医生姓名
      */
     private String doctorName;
+
+    /**
+     * 主任医生ID
+     */
+    private String directorDoctorId;
+
+    /**
+     * 主任医生姓名
+     */
+    private String directorDoctorName;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
 }

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

@@ -359,7 +359,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            if (null == response) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            } else {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】错误原因:" + response.getMsg());
+            }
         }
         OutputInfo outputInfo = response.getData();
         //根据质控结果获取质控条目
@@ -856,7 +861,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!");
+            if (null == response) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR, "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】");
+            } else {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "远程质控接口没有返回数据!【" + analyzeVO.getBehospitalCode() + "】错误原因:" + response.getMsg());
+            }
         }
         OutputInfo outputInfo = response.getData();
         //根据质控结果获取质控条目

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.util.ExcelUtils;
 import com.diagbot.vo.FilterOrderVO;
 import com.diagbot.vo.FilterPageVO;
@@ -46,6 +47,7 @@ public class ConsoleExportFacade {
     public void entryGroupByEntryExport(HttpServletResponse response, FilterPageVO filterPageVO) {
         filterPageVO.setCurrent(1L);
         filterPageVO.setSize(Long.MAX_VALUE);
+        filterPageVO.setSearchCount(false);
         IPage<EntryNumDTO> page = consoleFacade.entryGroupByEntryInnerPage(filterPageVO);
         String fileName = "条目缺陷占比.xls";
         ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", EntryNumDTO.class, fileName, response, 12.8f);
@@ -63,4 +65,15 @@ public class ConsoleExportFacade {
         ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsDTO.class, fileName, response, 12.8f);
     }
 
+    /**
+     * 各科室缺陷占比（组合）-台州
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    public void levelExport_TZ(HttpServletResponse response, FilterOrderVO filterOrderVO) {
+        List<LevelStatisticsTZDTO> records = consoleFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        String fileName = "各科室缺陷占比-台州.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsTZDTO.class, fileName, response, 12.8f);
+    }
 }

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryStatisticsDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -457,9 +458,9 @@ public class ConsoleFacade {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSet(filterOrderVO);
-        List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass2(filterOrderVO);
+        List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
         return records;
     }
 

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

@@ -55,7 +55,7 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
         QueryWrapper<ModelHospital> queryModelHospital = new QueryWrapper<>();
         queryModelHospital.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id",modeId);
-        ModelHospital modelHospital = modelHospitalService.getOne(queryModelHospital);
+        ModelHospital modelHospital = modelHospitalService.getOne(queryModelHospital, false);
         if(modelHospital == null){
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在！");
         }

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

@@ -120,7 +120,7 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
                 .eq("hospital_model_name", qcAbnormalModeVO.getDescription());
-        ModelHospital modeHospital = modelHospitalFacade.getOne(queryWrapper);
+        ModelHospital modeHospital = modelHospitalFacade.getOne(queryWrapper, false);
         List<QcModeAllDTO> dataMode = qcModeFacade.getModeAll();
         data.setQcModeDatas(dataMode);
         data.setDescription(qcAbnormalModeVO.getDescription());

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

@@ -149,7 +149,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 new QueryWrapper<QcresultInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", analyzeVO.getHospitalId())
-                        .eq("behospital_code", analyzeVO.getBehospitalCode()));
+                        .eq("behospital_code", analyzeVO.getBehospitalCode()), false);
         if (null == qcresultInfo) {
             qcresultInfo = new QcresultInfo();
         } else {

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

@@ -139,6 +139,37 @@ public class SysUserFacade extends SysUserServiceImpl {
         return data;
     }
 
+    /**
+     * 外部获取jwt
+     *
+     * @param username 用户名
+     * @return jwt
+     */
+    public JwtDTO getJwtNoPass(String username) {
+        JwtDTO data = new JwtDTO();
+        if (StringUtil.isBlank(username)) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
+                    "请输入用户名");
+        }
+        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("username", username)
+                .eq("status", StatusEnum.Enable.getKey())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
+        SysUser user = this.getOne(userQueryWrapper, false);
+        if (null == user) {
+            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
+        }
+        JwtStore jwt = tokenFacade.getToken(user.getId().toString());
+        if (null == jwt) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "Token不存在，请重新登录");
+        }
+        data.setAccessToken(jwt.getAccessToken());
+        data.setRefreshToken(jwt.getRefreshToken());
+        data.setType(user.getType());
+        data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
+        return data;
+    }
+
     /**
      * 刷新jwt
      *

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

@@ -79,7 +79,7 @@ public class ABasDeptInfoFacade extends BasDeptInfoServiceImpl{
         basDeptInfoList.stream().forEach(s -> {
             BasDeptInfo basDeptInfo =this.getOne(new QueryWrapper<BasDeptInfo>()
             .eq("dept_id", s.getDeptId())
-            .eq("hospital_id", s.getHospitalId()));
+            .eq("hospital_id", s.getHospitalId()), false);
             if (basDeptInfo != null) {
                 s.setGmtModified(new Date());
                 updateE.add(s);

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

@@ -4,6 +4,7 @@ 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;
@@ -79,6 +80,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 if(StringUtil.isNotBlank(s.getBehospitalDate())){
                     behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
                 }
+                if(StringUtil.isNotBlank(s.getPlacefileDate())){
+                    behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
+                }
                 behospitalInfoList.add(behospitalInfo);
 
             });
@@ -108,8 +112,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<BehospitalInfo> updateE = Lists.newLinkedList();
         behospitalInfoList.stream().forEach(s -> {
             BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
-            .eq("behospital_code", s.getBehospitalCode())
-            .eq("hospital_id", s.getHospitalId()));
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N), false);
             if (behospitalInfo != null) {
                 s.setGmtModified(new Date());
                 s.setQcTypeId(initQcTypeId(s));
@@ -139,11 +144,13 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedicalRecord medicalRecord = aMedicalRecordFacade.getOne(new QueryWrapper<MedicalRecord>()
                 .eq("behospital_code", s.getBehospitalCode())
                 .eq("hospital_id", s.getHospitalId())
-                .eq("mode_id", Long.valueOf("1")));
+                .eq("mode_id", Long.valueOf("1"))
+                .eq("is_deleted",IsDeleteEnum.N), false);
         if(medicalRecord!=null){
             QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                     .eq("name",medicalRecord.getRecTitle())
-                    .eq("hospital_id", s.getHospitalId()));
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("is_deleted",IsDeleteEnum.N), false);
             if(qcType!=null){
                 qcTypeId=qcType.getId();
             }else{

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

@@ -89,7 +89,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
                         .eq("doctor_advice_id", s.getDoctorAdviceId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code",s.getBehospitalCode()));
+                        .eq("behospital_code",s.getBehospitalCode()), false);
                 if (doctorAdvice != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -64,7 +64,7 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                     HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
                             .eq("home_page_id", s.getHomePageId())
                             .eq("hospital_id", s.getHospitalId())
-                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()));
+                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
                     if (diagnoseInfo != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);

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

@@ -67,7 +67,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                     queryWrapper.eq("home_page_id", s.getHomePageId());
                     queryWrapper.eq("hospital_id", s.getHospitalId());
                     queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    HomeOperationInfo operationInfo = this.getOne(queryWrapper);
+                    HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
                     if (operationInfo != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);

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

@@ -160,7 +160,12 @@ public class AHomePageFacade extends HomePageServiceImpl{
         String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
         Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
         Long modeId=Long.valueOf("6");//病案首页默认为6
-        if(aHomePageIngVO.getDockModeType().equals("1")){
+        if(aHomePageIngVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
+            map.put("homePages",homePageDtoList);
+            return RespDTO.onSuc(map);
+        }else if(aHomePageIngVO.getDockModeType().equals("1")){
             //页面模式
             String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
             Map<String,Object> map=new HashMap<String,Object>();
@@ -245,7 +250,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
                         .eq("home_page_id", s.getHomePageId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()));
+                        .eq("behospital_code", s.getBehospitalCode()), false);
                 if (homePage != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -64,7 +64,7 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
                 .eq("rec_id", s.getRecId())
                 .eq("hospital_id", s.getHospitalId())
                 .eq("behospital_code", s.getBehospitalCode())
-                .eq("rec_type", s.getRecType()));
+                .eq("rec_type", s.getRecType()), false);
                 if (medCrisisInfo != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordTypeDTO;
 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;
@@ -69,7 +70,8 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             medRecordTypeList.stream().forEach(s -> {
                 MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                         .eq("type_id", s.getTypeId())
-                        .eq("hospital_id", s.getHospitalId()));
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N), false);
                 if (mrType != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -58,7 +58,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                 QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("rec_id", s.getRecId());
                 queryWrapper.eq("hospital_id", s.getHospitalId());
-                MedicalRecordContent mrContent = this.getOne(queryWrapper);
+                MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
                 if (mrContent != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
@@ -152,7 +153,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         MedicalRecord medicalRecord=new MedicalRecord();
         BeanUtil.copyProperties(aMrContentVO.getRecords().get(0),medicalRecord);
         Long modeId=initModeId(medicalRecord);
-        if(aMrContentVO.getDockModeType().equals("1")){
+        if(aMrContentVO.getDockModeType().equals("0")){
+            Map<String,Object> map=new HashMap<String,Object>();
+            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(aMrContentVO.getRecords(), AMedicalRecordDTO.class);
+            map.put("records",medicalRecordDTOList);
+            return RespDTO.onSuc(map);
+        }else if(aMrContentVO.getDockModeType().equals("1")){
             if(modeId==0 || modeId==null){
                 return RespDTO.onError("无对应的文书类型");
             }
@@ -216,13 +222,14 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                     BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                             .eq("behospital_code", s.getBehospitalCode())
-                            .eq("hospital_id", s.getHospitalId()));
+                            .eq("hospital_id", s.getHospitalId()), false);
                     if(behospitalInfo!=null){
                         //如果病人住院信息存在，更新对应的qc_type_id
                         Long qcTypeId=Long.valueOf("0");
                         QcType qcType=qcTypeFacade.getOne(new QueryWrapper<QcType>()
                                 .eq("name",s.getRecTitle())
-                                .eq("hospital_id", s.getHospitalId()));
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("is_deleted",IsDeleteEnum.N), false);
                         if(qcType!=null){
                             behospitalInfo.setQcTypeId(qcType.getId());
                         }else{
@@ -252,7 +259,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 MedicalRecord mRecord = this.getOne(new QueryWrapper<MedicalRecord>()
                         .eq("rec_id", s.getRecId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()));
+                        .eq("behospital_code", s.getBehospitalCode()), false);
                 if (mRecord != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -287,7 +294,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
         wrapper.eq("hospital_id",medicalRecord.getHospitalId());
         wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
-        ModelHospital mode=modelHospitalFacade.getOne(wrapper);
+        ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
         if(mode!=null){
             modeId=mode.getStandModelId();
         }else{

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.EntryStatisticsDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -181,20 +182,20 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
 
     List<ExportExcelDTO> exportExcel();

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.EntryStatisticsDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -182,20 +183,20 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
     List<ExportExcelDTO> exportExcel();
 

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

@@ -43,4 +43,12 @@ public interface SysTokenService {
      * @return 删除是否成功
      */
     Boolean deleteBatchToken(List<Long> userIds);
+
+    /**
+     * 获取用户jwt
+     *
+     * @param userId 用户ID
+     * @return jwt信息
+     */
+    JwtStore getToken(String userId);
 }

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.EntryStatisticsDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -245,25 +246,25 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     }
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
     @Override
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
         return baseMapper.levelStatisticsByDeptClass(filterOrderVO);
     }
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
     @Override
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO) {
-        return baseMapper.levelStatisticsByDeptClass2(filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
+        return baseMapper.levelStatisticsByDeptClass_TZ(filterOrderVO);
     }
 
     @Override

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

@@ -169,4 +169,28 @@ public class SysTokenServiceImpl implements SysTokenService {
         });
         return l > 0;
     }
+
+    /**
+     * 获取用户jwt
+     *
+     * @param userId 用户ID
+     * @return jwt信息
+     */
+    @Override
+    public JwtStore getToken(String userId) {
+        JwtStore tokenStore = null;
+        //从redis中取出
+        final byte[] redis_key = getUserTokenKey(userId);
+        tokenStore = (JwtStore) redisForToken.execute(new RedisCallback<JwtStore>() {
+            @Override
+            public JwtStore doInRedis(RedisConnection connection) throws DataAccessException {
+                byte[] bytes = connection.get(redis_key);
+                if (bytes == null) {
+                    return null;
+                }
+                return (JwtStore) deserializeValue(bytes);
+            }
+        });
+        return tokenStore;
+    }
 }

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

@@ -55,7 +55,7 @@ public class BasDeptInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK011"));
+                        .eq("cron_code", "TASK011"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -54,7 +54,7 @@ public class BasDoctorInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK010"));
+                        .eq("cron_code", "TASK010"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -61,7 +61,7 @@ public class BehospitalInfoAnalyzeTask implements SchedulingConfigurer {
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK001"));
+                        .eq("cron_code", "TASK001"), false);
                 String cron = "0/5 * * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -54,7 +54,7 @@ public class BehospitalInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK008"));
+                        .eq("cron_code", "TASK008"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -55,7 +55,7 @@ public class DoctorAdviceTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK009"));
+                        .eq("cron_code", "TASK009"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -1,9 +1,12 @@
 package com.diagbot.task;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.SysTaskCron;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.SysTaskCronFacade;
 import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
+import com.diagbot.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.Trigger;
@@ -13,26 +16,21 @@ import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.util.StringUtil;
-
-import lombok.extern.slf4j.Slf4j;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 @Slf4j
-public class HomeDiagnoseInfoTask implements SchedulingConfigurer{
-	@Autowired
+public class HomeDiagnoseInfoTask implements SchedulingConfigurer {
+    @Autowired
     private SysTaskCronFacade sysTaskCronFacade;
 
     private SysTaskCron task001 = new SysTaskCron();
 
     @Autowired
-   	private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
-    
+    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+
     /**
      * 执行定时任务.
      */
@@ -54,7 +52,7 @@ public class HomeDiagnoseInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK003"));
+                        .eq("cron_code", "TASK003"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -55,7 +55,7 @@ public class HomeOperationInfoTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK004"));
+                        .eq("cron_code", "TASK004"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -54,7 +54,7 @@ public class HomePageTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK002"));
+                        .eq("cron_code", "TASK002"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -55,7 +55,7 @@ public class MedicalRecordContentTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK007"));
+                        .eq("cron_code", "TASK007"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -55,7 +55,7 @@ public class MedicalRecordTask implements SchedulingConfigurer{
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK006"));
+                        .eq("cron_code", "TASK006"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -52,7 +52,7 @@ public class MedicalRecordTypeTask implements SchedulingConfigurer {
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK005"));
+                        .eq("cron_code", "TASK005"), false);
                 String cron = "0 0/1 * * * ?";
                 //2.2 合法性校验.
                 if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {

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

@@ -64,8 +64,7 @@ public class TASK_CX implements SchedulingConfigurer {
             public Date nextExecutionTime(TriggerContext triggerContext) {
                 //2.1 从数据库获取执行周期
                 task = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK_CX")
-                );
+                        .eq("cron_code", "TASK_CX"), false);
                 String cron = "0/5 * * * * ?";
                 //2.2 合法性校验.
                 if (null != task && StringUtil.isNotBlank(task.getCron())) {

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

@@ -82,7 +82,7 @@ public class BehospitalPageVO extends Page implements Serializable {
     /**
      * 医生工号
      */
-    private Long doctorCode;
+    private String doctorCode;
 
     /**
      * 统计维度 1-本月，2-本年

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

@@ -32,6 +32,10 @@ public class QcResultShortPageVO extends Page {
      * 条目名称
      */
     private String casesEntryName;
+    /**
+     * 条目id
+     */
+    private Long casesEntryId;
     /**
      * 科室名称
      */
@@ -48,4 +52,14 @@ public class QcResultShortPageVO extends Page {
     private Date startDate;
     @NotNull(message = "请输入截止时间")
     private Date endDate;
+
+    /**
+     * 单项否决
+     */
+    private Integer isReject;
+
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: 登录参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class UserLoginNoPassVO {
+
+    @NotBlank(message = "请输入用户名!")
+    private String username;
+
+}

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

@@ -2,8 +2,6 @@ package com.diagbot.vo.data;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class ABehospitalInfoVO {
     /**
@@ -131,4 +129,14 @@ public class ABehospitalInfoVO {
      */
     private String directorDoctorName;
 
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private String placefileDate;
+
 }

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

@@ -154,13 +154,15 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
     }
 
-    @ApiOperation(value = "对病历进行评分[by:zhoutg]",
+    @ApiOperation(value = "对病历进行评分【****************批量评分*************】[by:zhoutg]",
             notes = "参数内容清空：【所有医院】【未评分】病历数据<br>" +
                     "<br>" +
-                    "type：类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)<br>" +
                     "hosptialIdList：医院列表id，1：长兴，3：台州，2：邵逸夫<br>" +
-                    "filterFlag： 筛选病历数据：0：未评分的病历，【推荐使用】；1：全部病历,【谨慎使用】<br>" +
-                    "useCrfCache: 是否使用crf缓存（true：使用crf缓存，false：不使用）")
+                    "useCrfCache: 是否使用crf缓存（true：使用crf缓存，false：不使用）<br>" +
+                    "【个性化需求】——默认即可<br>" +
+                    "filterFlag： 筛选病历数据：0：未评分的病历【推荐使用】；1：全部病历【谨慎使用】<br>" +
+                    "individuation：【1：近3天不含当天的病历强制评分更新】<br>" +
+                    "type：【1：出院时间比当前时间早3天前的病历（例如：长兴病历）】)<br>")
     @PostMapping("/execule")
     @SysLogger("execule")
     public RespDTO<Boolean> execule(@RequestBody TaskVO taskVO) {

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

@@ -213,9 +213,12 @@ public class ConsoleByDeptController {
             notes = "behospitalCode： 病历号)<br>" +
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
+                    "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "doctorName：主治医生名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortByDeptPage")

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryStatisticsDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
 import com.diagbot.dto.RespDTO;
@@ -407,8 +408,8 @@ public class ConsoleController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/levelStatisticsByDeptClass")
     @SysLogger("levelStatisticsByDeptClass")
-    public RespDTO<List<LevelStatisticsDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return RespDTO.onSuc(consoleFacade.levelStatisticsByDeptClass(filterOrderVO));
+    public RespDTO<List<LevelStatisticsTZDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
+        return RespDTO.onSuc(consoleFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
     }
 
     /**
@@ -457,8 +458,11 @@ public class ConsoleController {
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
+                    "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortPage")

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

@@ -79,4 +79,22 @@ public class ConsoleExportController {
     public void levelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
         consoleExportFacade.levelExport(response, filterOrderVO);
     }
+
+    /**
+     * 各科室缺陷占比（组合）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    @ApiOperation(value = "各科室缺陷占比（组合）导出-台州[by:gaodm]",
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "level： 病历等级 <br>" +
+                    "name： 科室名称 <br>" +
+                    "asc： 排序（升序） <br>" +
+                    "desc： 排序（降序） <br>")
+    @PostMapping("/levelExport_TZ")
+    @SysLogger("levelExport_TZ")
+    public void levelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
+        consoleExportFacade.levelExport_TZ(response, filterOrderVO);
+    }
 }

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

@@ -17,6 +17,7 @@ import com.diagbot.vo.SysUserBaseVO;
 import com.diagbot.vo.SysUserDeptVO;
 import com.diagbot.vo.SysUserQueryVO;
 import com.diagbot.vo.SysUserRoleVO;
+import com.diagbot.vo.UserLoginNoPassVO;
 import com.diagbot.vo.UserLoginVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,6 +69,15 @@ public class SysUserController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "登录获取jwt[by:gaodm]",
+            notes = "username：用户名,必填<br>")
+    @PostMapping("/getJwtNoPass")
+    @SysLogger("getJwtNoPass")
+    public RespDTO<JwtDTO> getJwtNoPass(@RequestBody UserLoginNoPassVO userLoginNoPassVO) {
+        JwtDTO data = userFacade.getJwtNoPass(userLoginNoPassVO.getUsername());
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "刷新jwt[by:gaodm]",
             notes = "refreshToken：刷新令牌,必填<br>")
     @PostMapping("/refreshJwt")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -1074,9 +1074,9 @@
         </if>
     </select>
 
-    <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计 -->
+    <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州 -->
     <select id="levelStatisticsByDeptClass" parameterType="com.diagbot.vo.FilterOrderVO"
-            resultType="com.diagbot.dto.LevelStatisticsDTO">
+            resultType="com.diagbot.dto.LevelStatisticsTZDTO">
         SELECT
         t1.deptId,
         t1.deptName,
@@ -1282,7 +1282,7 @@
     </select>
 
     <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空） -->
-    <select id="levelStatisticsByDeptClass2" parameterType="com.diagbot.vo.FilterOrderVO" resultType="com.diagbot.dto.LevelStatisticsDTO">
+    <select id="levelStatisticsByDeptClass_TZ" parameterType="com.diagbot.vo.FilterOrderVO" resultType="com.diagbot.dto.LevelStatisticsTZDTO">
         SELECT
         t1.deptId,
         t1.deptName,
@@ -2597,21 +2597,17 @@
         med_behospital_info a,
         med_qcresult_info b,
         med_qcresult_detail c,
-        qc_cases d,
-        sys_user_dept e
+        qc_cases d
         WHERE
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
-        AND e.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = e.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.id
-        AND a.beh_dept_id = e.dept_id
         AND a.is_placefile = '1'
         AND a.doctor_id in
             (SELECT doctor_id FROM `bas_doctor_info`
@@ -2627,9 +2623,6 @@
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
-        <if test="userId != null ">
-            AND e.user_id = #{userId}
-        </if>
         <if test="leaveHosDateStart != null ">
             <![CDATA[ and a.leave_hospital_date >= DATE(#{leaveHosDateStart})]]>
         </if>
@@ -2666,8 +2659,7 @@
         a.beh_dept_name AS behDeptName
         FROM
         med_behospital_info a,
-        med_qcresult_info b,
-        sys_user_dept c
+        med_qcresult_info b
         WHERE
         a.is_deleted = 'N'
         AND a.doctor_id in
@@ -2681,19 +2673,13 @@
             and c1.id = #{userId}
             ))
         AND b.is_deleted = 'N'
-        AND c.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
-        AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
-        AND a.beh_dept_id = c.dept_id
         AND a.is_placefile = '1'
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
-        <if test="userId != null ">
-            AND c.user_id = #{userId}
-        </if>
         <if test="leaveHosDateStart != null ">
             <![CDATA[ and a.leave_hospital_date >= DATE(#{leaveHosDateStart})]]>
         </if>
@@ -2804,6 +2790,15 @@
         <if test="qcResultShortPageVO.casesEntryName != null and qcResultShortPageVO.casesEntryName != ''">
             AND d.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.casesEntryName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
+            AND d.id = #{qcResultShortPageVO.casesEntryId}
+        </if>
+        <if test="qcResultShortPageVO.isReject != null">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -2889,6 +2884,15 @@
         <if test="qcResultShortPageVO.casesEntryName != null and qcResultShortPageVO.casesEntryName != ''">
             AND d.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.casesEntryName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
+            AND d.id = #{qcResultShortPageVO.casesEntryId}
+        </if>
+        <if test="qcResultShortPageVO.isReject != null">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -2968,6 +2972,12 @@
                 <if test="item.directorDoctorName != null">
                     director_doctor_name = #{item.directorDoctorName},
                 </if>
+                <if test="item.placefileDate != null">
+                    placefile_date = #{item.placefileDate},
+                </if>
+                <if test="item.isPlacefile != null">
+                    is_placefile = #{item.isPlacefile},
+                </if>
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1014,17 +1014,14 @@
             med_qcresult_info c,
         </if>
         med_qcresult_detail d,
-        qc_cases_entry e,
-        qc_cases_entry_hospital f
+        qc_cases_entry e
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         and e.is_deleted='N'
-        and f.is_deleted='N'
         AND a.hospital_id = c.hospital_id
         and a.hospital_id = d.hospital_id
-        and a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1033,13 +1030,12 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        and e.id = f.cases_entry_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.casesId != null and filterPageVO.casesId != 0">
             AND d.cases_id = #{filterPageVO.casesId}
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
+            AND e.cases_name = #{filterPageVO.casesName}
         </if>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1054,7 +1050,7 @@
             AND e.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+            AND a.beh_dept_name = #{filterPageVO.deptName}
         </if>
         <if test="filterPageVO.ruleType != null">
             AND e.rule_type = #{filterPageVO.ruleType}
@@ -1074,17 +1070,14 @@
             med_qcresult_info c,
         </if>
         med_qcresult_detail d,
-        qc_cases_entry e,
-        qc_cases_entry_hospital f
+        qc_cases_entry e
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         and e.is_deleted='N'
-        and f.is_deleted='N'
         AND a.hospital_id = c.hospital_id
         and a.hospital_id = d.hospital_id
-        and a.hospital_id = f.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1093,13 +1086,12 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        and e.id = f.cases_entry_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageVO.casesId != null and filterPageVO.casesId != 0">
             AND d.cases_id = #{filterPageVO.casesId}
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
+            AND e.cases_name = #{filterPageVO.casesName}
         </if>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1110,11 +1102,8 @@
         <if test="filterPageVO.endDate != null and filterPageVO.endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{filterPageVO.endDate})]]>
         </if>
-        <if test="filterPageVO.name != null and filterPageVO.name != ''">
-            AND e.name like CONCAT('%', #{filterPageVO.name},'%')
-        </if>
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+            AND a.beh_dept_name  =  #{filterPageVO.deptName}
         </if>
         <if test="filterPageVO.ruleType != null">
             AND e.rule_type = #{filterPageVO.ruleType}
@@ -1394,19 +1383,16 @@
         </if>
         med_qcresult_detail d,
         qc_cases_entry e,
-        sys_user_dept f,
-        qc_cases_entry_hospital g
+        sys_user_dept f
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND f.is_deleted = 'N'
-        AND g.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
-        AND a.hospital_id = g.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1415,14 +1401,13 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        AND g.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != 0">
             AND d.cases_id = #{filterPageByDeptVO.casesId}
         </if>
         <if test="filterPageByDeptVO.casesName != null and filterPageByDeptVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageByDeptVO.casesName},'%')
+            AND e.cases_name = #{filterPageByDeptVO.casesName}
         </if>
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -1440,14 +1425,14 @@
             AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
+            AND a.beh_dept_name =  #{filterPageByDeptVO.deptName}
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             <if test="filterPageByDeptVO.doctorName=='未知'">
                 AND (a.doctor_name is null OR a.doctor_name='')
             </if>
             <if test="filterPageByDeptVO.doctorName!='未知'">
-                AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
+                AND a.doctor_name = #{filterPageByDeptVO.doctorName}
             </if>
         </if>
         <if test="filterPageByDeptVO.ruleType != null ">
@@ -1469,19 +1454,16 @@
         </if>
         med_qcresult_detail d,
         qc_cases_entry e,
-        sys_user_dept f,
-        qc_cases_entry_hospital g
+        sys_user_dept f
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
         AND f.is_deleted = 'N'
-        AND g.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
         AND a.hospital_id = d.hospital_id
         AND a.hospital_id = f.hospital_id
-        AND a.hospital_id = g.hospital_id
         AND a.behospital_code = c.behospital_code
         AND a.behospital_code = d.behospital_code
         AND a.is_placefile = '1'
@@ -1490,14 +1472,13 @@
         </if>
         AND d.cases_id = e.cases_id
         AND d.cases_entry_id = e.id
-        AND g.cases_entry_id = e.id
         AND a.beh_dept_id = f.dept_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != 0">
             AND d.cases_id = #{filterPageByDeptVO.casesId}
         </if>
         <if test="filterPageByDeptVO.casesName != null and filterPageByDeptVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageByDeptVO.casesName},'%')
+            AND e.cases_name = #{filterPageByDeptVO.casesName}
         </if>
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -1511,18 +1492,15 @@
         <if test="filterPageByDeptVO.endDate != null and filterPageByDeptVO.endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{filterPageByDeptVO.endDate})]]>
         </if>
-        <if test="filterPageByDeptVO.name != null and filterPageByDeptVO.name != ''">
-            AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
-        </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
+            AND a.beh_dept_name =  #{filterPageByDeptVO.deptName}
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             <if test="filterPageByDeptVO.doctorName=='未知'">
                 AND (a.doctor_name is null OR a.doctor_name='')
             </if>
             <if test="filterPageByDeptVO.doctorName!='未知'">
-                AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
+                AND a.doctor_name = #{filterPageByDeptVO.doctorName}
             </if>
         </if>
         <if test="filterPageByDeptVO.ruleType != null ">