Browse Source

Merge branch 'master' into his/common

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
#	src/test/java/com/diagbot/CodeGeneration.java
liuqq 3 years ago
parent
commit
ee87c6d4dc
63 changed files with 2767 additions and 460 deletions
  1. 19 0
      doc/003.20211009子医院映射/cdss_init.sql
  2. 571 0
      doc/003.20211009子医院映射/user_init.sql
  3. 9 8
      src/main/java/com/diagbot/aggregate/AssembleAggregate.java
  4. 8 7
      src/main/java/com/diagbot/aggregate/AssemblePushAggregate.java
  5. 9 0
      src/main/java/com/diagbot/client/CdssCoreClient.java
  6. 14 1
      src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java
  7. 3 4
      src/main/java/com/diagbot/config/ResourceServerConfigurer.java
  8. 3 4
      src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
  9. 72 0
      src/main/java/com/diagbot/dto/HospitalInfoGetDTO.java
  10. 30 0
      src/main/java/com/diagbot/dto/HospitalRelationDTO.java
  11. 27 0
      src/main/java/com/diagbot/dto/HospitalRelationErrorDTO.java
  12. 13 0
      src/main/java/com/diagbot/dto/IndexBatchDTO.java
  13. 1 1
      src/main/java/com/diagbot/entity/AnesthesiaConfig.java
  14. 1 1
      src/main/java/com/diagbot/entity/DeptConfig.java
  15. 1 1
      src/main/java/com/diagbot/entity/DiseaseConfig.java
  16. 6 60
      src/main/java/com/diagbot/entity/DrugConfig.java
  17. 1 1
      src/main/java/com/diagbot/entity/LisConfig.java
  18. 1 1
      src/main/java/com/diagbot/entity/NurseConfig.java
  19. 1 1
      src/main/java/com/diagbot/entity/OperationConfig.java
  20. 1 1
      src/main/java/com/diagbot/entity/PacsConfig.java
  21. 1 1
      src/main/java/com/diagbot/entity/ScaleConfig.java
  22. 1 1
      src/main/java/com/diagbot/entity/TcmdiseaseConfig.java
  23. 1 1
      src/main/java/com/diagbot/entity/TcmsyndromeConfig.java
  24. 74 0
      src/main/java/com/diagbot/entity/TranHospitalRelation.java
  25. 1 1
      src/main/java/com/diagbot/entity/TransfusionConfig.java
  26. 23 0
      src/main/java/com/diagbot/entity/wrapper/AnesthesiaConfigWrapper.java
  27. 24 0
      src/main/java/com/diagbot/entity/wrapper/DeptConfigWrapper.java
  28. 23 0
      src/main/java/com/diagbot/entity/wrapper/DiseaseConfigWrapper.java
  29. 28 0
      src/main/java/com/diagbot/entity/wrapper/DrugConfigWrapper.java
  30. 23 0
      src/main/java/com/diagbot/entity/wrapper/LisConfigWrapper.java
  31. 10 1
      src/main/java/com/diagbot/entity/wrapper/MappingConfigWrapper.java
  32. 23 0
      src/main/java/com/diagbot/entity/wrapper/NurseConfigWrapper.java
  33. 23 0
      src/main/java/com/diagbot/entity/wrapper/OperationConfigWrapper.java
  34. 23 0
      src/main/java/com/diagbot/entity/wrapper/PacsConfigWrapper.java
  35. 23 0
      src/main/java/com/diagbot/entity/wrapper/ScaleConfigWrapper.java
  36. 23 0
      src/main/java/com/diagbot/entity/wrapper/TcmdiseaseConfigWrapper.java
  37. 23 0
      src/main/java/com/diagbot/entity/wrapper/TcmsyndromeConfigWrapper.java
  38. 23 0
      src/main/java/com/diagbot/entity/wrapper/TransfusionConfigWrapper.java
  39. 2 1
      src/main/java/com/diagbot/enums/MatchSourceEnum.java
  40. 4 2
      src/main/java/com/diagbot/exception/ServiceErrorCode.java
  41. 7 7
      src/main/java/com/diagbot/facade/ConceptInfoFacade.java
  42. 142 0
      src/main/java/com/diagbot/facade/HospitalInfoFacade.java
  43. 10 7
      src/main/java/com/diagbot/facade/KlConceptStaticFacade.java
  44. 1084 332
      src/main/java/com/diagbot/facade/MappingConfigFacade.java
  45. 14 0
      src/main/java/com/diagbot/facade/TranHospitalRelationFacade.java
  46. 16 0
      src/main/java/com/diagbot/mapper/TranHospitalRelationMapper.java
  47. 16 0
      src/main/java/com/diagbot/service/TranHospitalRelationService.java
  48. 3 2
      src/main/java/com/diagbot/service/impl/MrServiceImpl.java
  49. 1 1
      src/main/java/com/diagbot/service/impl/SysTokenServiceImpl.java
  50. 20 0
      src/main/java/com/diagbot/service/impl/TranHospitalRelationServiceImpl.java
  51. 1 0
      src/main/java/com/diagbot/vo/ConceptVO.java
  52. 1 0
      src/main/java/com/diagbot/vo/FilterVO.java
  53. 61 0
      src/main/java/com/diagbot/vo/HospitalInfoSaveVO.java
  54. 32 0
      src/main/java/com/diagbot/vo/HospitalRelationVO.java
  55. 18 0
      src/main/java/com/diagbot/vo/IndexByApprovalVO.java
  56. 14 0
      src/main/java/com/diagbot/vo/MappingConfigPageVO.java
  57. 26 0
      src/main/java/com/diagbot/web/HospitalInfoController.java
  58. 41 7
      src/main/java/com/diagbot/web/MappingConfigController.java
  59. 18 0
      src/main/java/com/diagbot/web/MrController.java
  60. 20 0
      src/main/java/com/diagbot/web/TranHospitalRelationController.java
  61. 30 0
      src/main/resources/mapper/MappingConfigMapper.xml
  62. 19 0
      src/main/resources/mapper/TranHospitalRelationMapper.xml
  63. 6 5
      src/test/java/com/diagbot/CodeGeneration.java

+ 19 - 0
doc/003.20211009子医院映射/cdss_init.sql

@@ -0,0 +1,19 @@
+use `cdss`;
+
+DROP TABLE IF EXISTS `tran_hospital_relation`;
+CREATE TABLE `tran_hospital_relation` (
+  `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则表示纪录未修改',
+  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '子医院编码',
+  `name` varchar(255) NOT NULL DEFAULT '' COMMENT '子医院名称',
+  `hospital_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父医院id',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code_name` (`code`,`name`) USING BTREE,
+  KEY `name` (`name`) USING BTREE,
+  KEY `hospital_id` (`hospital_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='医院关联表';

+ 571 - 0
doc/003.20211009子医院映射/user_init.sql

@@ -0,0 +1,571 @@
+use `cdss`;
+
+-- ----------------------------
+-- Table structure for sys_menu
+-- ----------------------------
+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 '编码,与前端对应',
+                            `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序,从小到大',
+                            `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注',
+                            PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COMMENT='系统菜单';
+
+-- ----------------------------
+-- Records of sys_menu
+-- ----------------------------
+INSERT INTO `sys_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语库维护', '-1', 'CDSS-YXSYK', '1', '');
+INSERT INTO `sys_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '系统配置', '-1', 'CDSS-XTPZ', '2', '');
+INSERT INTO `sys_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断关联维护', '1', 'YXSYK-ZDGLWH', '2', '医学术语库维护-诊断关联维护');
+INSERT INTO `sys_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '检验关联维护', '1', 'YXSYK-JYGLWH', '3', '医学术语库维护-检验关联维护');
+INSERT INTO `sys_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '检查关联维护', '1', 'YXSYK-JCGLWH', '4', '医学术语库维护-检验关联维护-检查关联维护');
+INSERT INTO `sys_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品关联维护', '1', 'YXSYK-YPGLWH', '5', '');
+INSERT INTO `sys_menu` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术/操作关联维护', '1', 'YXSYK-SSCZGLWH', '6', '');
+INSERT INTO `sys_menu` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室关联维护', '1', 'YXSYK-KSGLWH', '8', '');
+INSERT INTO `sys_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医学术语静态知识维护', '1', 'YXSYK-JTZSWH', '1', '');
+INSERT INTO `sys_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '关联维护设置', '1', 'YXSYK-GLWH', '100', '');
+INSERT INTO `sys_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '电子病历方案配置', '2', 'XTPZ-DZBLFAPZ', '1', '');
+INSERT INTO `sys_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血关联维护', '1', 'YXSYK-SXGLWH', '7', '');
+INSERT INTO `sys_menu` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '规则维护', '-1', 'CDSS-GZWH', '3', '规则维护');
+INSERT INTO `sys_menu` VALUES ('14', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '开单合理性规则维护', '13', 'GZWH-KDHLXGZWH', '1', '规则维护-开单合理性规则维护');
+INSERT INTO `sys_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '规则维护', '13', 'GZWH-GZWH', '1', '规则维护-规则维护');
+INSERT INTO `sys_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表关联维护', '1', 'YXSYK-LBGLWH', '9', '医学术语库维护-量表关联维护');
+INSERT INTO `sys_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理关联维护', '1', 'YXSYK-HLGLWH', '10', '医学术语库维护-护理关联维护');
+INSERT INTO `sys_menu` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病关联维护', '1', 'YXSYK-ZYJBGLWH', '11', '医学术语库维护-中医疾病关联维护');
+INSERT INTO `sys_menu` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候关联维护', '1', 'YXSYK-ZYZHGLWH', '12', '医学术语库维护-中医证候关联维护');
+INSERT INTO `sys_menu` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '子医院维护', '2', 'XTPZ-ZYYWH', '2', '');
+
+-- ----------------------------
+-- Table structure for sys_menu_permission
+-- ----------------------------
+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=95 DEFAULT CHARSET=utf8 COMMENT='菜单和系统资源的映射表';
+
+-- ----------------------------
+-- Records of sys_menu_permission
+-- ----------------------------
+INSERT INTO `sys_menu_permission` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '4', '基础功能-修改密码');
+INSERT INTO `sys_menu_permission` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '5', '根据医院获取方案配置信息');
+INSERT INTO `sys_menu_permission` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '6', '诊断公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '7', '诊断公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '8', '诊断公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '9', '诊断公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '3', '10', '诊断公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '11', '化验公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '12', '化验公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '13', '化验公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '14', '化验公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '15', '化验公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '16', '化验公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '17', '化验公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '18', '辅检公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '19', '辅检公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '20', '辅检公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '21', '辅检公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '22', '辅检公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '23', '辅检公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '24', '辅检公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '25', '药品公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '26', '药品公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '27', '药品公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '28', '药品公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '29', '药品公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '30', '药品公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '31', '药品公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '32', '手术公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '33', '手术公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '34', '手术公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '35', '手术公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '36', '手术公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '37', '手术公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '38', '手术公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '39', '科室公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '40', '科室公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '41', '科室公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '42', '科室公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '43', '科室公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '44', '科室公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '45', '科室公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '46', '静态知识标准术语-医学术语检索-新增静态知识');
+INSERT INTO `sys_menu_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '47', '静态知识标准术语-获取静态知识列表');
+INSERT INTO `sys_menu_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '48', '静态知识标准术语-保存静态知识-新增或修改');
+INSERT INTO `sys_menu_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '49', '静态知识标准术语-静态知识启用禁用');
+INSERT INTO `sys_menu_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '50', '静态知识标准术语-静态知识是否存在');
+INSERT INTO `sys_menu_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '9', '51', '静态知识标准术语-根据术语id获取静态信息');
+INSERT INTO `sys_menu_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '10', '52', '关联维护设置-医院信息——修改医院信息');
+INSERT INTO `sys_menu_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '53', '方案配置信息-保存更新方案配置信息');
+INSERT INTO `sys_menu_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '54', '方案配置信息-删除方案配置信息');
+INSERT INTO `sys_menu_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '55', '方案配置信息-停用启用方案配置');
+INSERT INTO `sys_menu_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '56', '方案配置信息-获取默认方案配置');
+INSERT INTO `sys_menu_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '57', '方案配置信息明细-根据医院编码获取配置信息明细');
+INSERT INTO `sys_menu_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '58', '方案配置信息明细-保存更新方案配置信息明细');
+INSERT INTO `sys_menu_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '59', '方案配置信息明细-删除方案配置明细');
+INSERT INTO `sys_menu_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '11', '60', '方案配置信息明细-停用启用方案配置明细');
+INSERT INTO `sys_menu_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '61', '输血公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '62', '输血公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '63', '输血公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '64', '输血公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '65', '输血公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '66', '输血公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '67', '输血公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '68', '量表公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '69', '量表公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '70', '量表公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '71', '量表公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '72', '量表公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '73', '量表公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '74', '量表公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '75', '护理公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '76', '护理公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '77', '护理公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '78', '护理公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '79', '护理公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '80', '护理公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '81', '护理公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '82', '中医疾病公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '83', '中医疾病公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '84', '中医疾病公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '85', '中医疾病公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '86', '中医疾病公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '87', '中医疾病公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '88', '中医疾病公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '89', '中医证候公表映射-映射关系是否已存在');
+INSERT INTO `sys_menu_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '90', '中医证候公表映射-保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '91', '中医证候公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '92', '中医证候公表映射-删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '93', '中医证候公表映射-批量删除映射关系');
+INSERT INTO `sys_menu_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '94', '中医证候公表映射-公表数据导入');
+INSERT INTO `sys_menu_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '19', '95', '中医证候公表映射-数据导出');
+INSERT INTO `sys_menu_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '96', '子医院维护-获取子医院信息');
+INSERT INTO `sys_menu_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '20', '97', '子医院维护-编辑子医院信息');
+
+-- ----------------------------
+-- Table structure for sys_permission
+-- ----------------------------
+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 '资源描述',
+                                  `type` int(11) DEFAULT '0' COMMENT 'token验证,0关,1开',
+                                  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                                  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8 COMMENT='系统资源表';
+
+-- ----------------------------
+-- Records of sys_permission
+-- ----------------------------
+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', '基础功能-用户账号-获取用户、医院、菜单信息', '0', 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', '基础功能-修改密码', '0', null);
+INSERT INTO `sys_permission` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '根据医院获取方案配置信息', 'FUNC000003', '/sys/plan/getSysPlanInfoDatas', 'ALL', '根据医院获取方案配置信息', '1', null);
+INSERT INTO `sys_permission` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-映射关系是否已存在', 'FUNC000004', '/tran/diseaseConfig/isExistRecord', 'ALL', '诊断公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-保存或修改映射关系', 'FUNC000005', '/tran/diseaseConfig/saveOrUpdateRecord', 'ALL', '诊断公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-批量保存或修改映射关系', 'FUNC000006', '/tran/diseaseConfig/saveOrUpdateRecords', 'ALL', '诊断公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-删除映射关系', 'FUNC000007', '/tran/diseaseConfig/deleteRecord', 'ALL', '诊断公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-批量删除映射关系', 'FUNC000008', '/tran/diseaseConfig/deleteRecords', 'ALL', '诊断公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-公表数据导入', 'FUNC000009', '/tran/diseaseConfig/importExcel', 'ALL', '诊断公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '诊断公表映射-数据导出', 'FUNC000010', '/tran/diseaseConfig/exportExcel', 'ALL', '诊断公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-映射关系是否已存在', 'FUNC000011', '/tran/lisConfig/isExistRecord', 'ALL', '化验公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-保存或修改映射关系', 'FUNC000012', '/tran/lisConfig/saveOrUpdateRecord', 'ALL', '化验公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-批量保存或修改映射关系', 'FUNC000013', '/tran/lisConfig/saveOrUpdateRecords', 'ALL', '化验公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-删除映射关系', 'FUNC000014', '/tran/lisConfig/deleteRecord', 'ALL', '化验公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-批量删除映射关系', 'FUNC000015', '/tran/lisConfig/deleteRecords', 'ALL', '化验公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-公表数据导入', 'FUNC000016', '/tran/lisConfig/importExcel', 'ALL', '化验公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '化验公表映射-数据导出', 'FUNC000017', '/tran/lisConfig/exportExcel', 'ALL', '化验公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-映射关系是否已存在', 'FUNC000018', '/tran/pacsConfig/isExistRecord', 'ALL', '辅检公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-保存或修改映射关系', 'FUNC000019', '/tran/pacsConfig/saveOrUpdateRecord', 'ALL', '辅检公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-批量保存或修改映射关系', 'FUNC000020', '/tran/pacsConfig/saveOrUpdateRecords', 'ALL', '辅检公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-删除映射关系', 'FUNC000021', '/tran/pacsConfig/deleteRecord', 'ALL', '辅检公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-批量删除映射关系', 'FUNC000022', '/tran/pacsConfig/deleteRecords', 'ALL', '辅检公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-公表数据导入', 'FUNC000023', '/tran/pacsConfig/importExcel', 'ALL', '辅检公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '辅检公表映射-数据导出', 'FUNC000024', '/tran/pacsConfig/exportExcel', 'ALL', '辅检公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-映射关系是否已存在', 'FUNC000025', '/tran/drugConfig/isExistRecord', 'ALL', '药品公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-保存或修改映射关系', 'FUNC000026', '/tran/drugConfig/saveOrUpdateRecord', 'ALL', '药品公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-批量保存或修改映射关系', 'FUNC000027', '/tran/drugConfig/saveOrUpdateRecords', 'ALL', '药品公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-删除映射关系', 'FUNC000028', '/tran/drugConfig/deleteRecord', 'ALL', '药品公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-批量删除映射关系', 'FUNC000029', '/tran/drugConfig/deleteRecords', 'ALL', '药品公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-公表数据导入', 'FUNC000030', '/tran/drugConfig/importExcel', 'ALL', '药品公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '药品公表映射-数据导出', 'FUNC000031', '/tran/drugConfig/exportExcel', 'ALL', '药品公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-映射关系是否已存在', 'FUNC000032', '/tran/operationConfig/isExistRecord', 'ALL', '手术公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-保存或修改映射关系', 'FUNC000033', '/tran/operationConfig/saveOrUpdateRecord', 'ALL', '手术公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-批量保存或修改映射关系', 'FUNC000034', '/tran/operationConfig/saveOrUpdateRecords', 'ALL', '手术公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-删除映射关系', 'FUNC000035', '/tran/operationConfig/deleteRecord', 'ALL', '手术公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-批量删除映射关系', 'FUNC000036', '/tran/operationConfig/deleteRecords', 'ALL', '手术公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-公表数据导入', 'FUNC000037', '/tran/operationConfig/importExcel', 'ALL', '手术公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '手术公表映射-数据导出', 'FUNC000038', '/tran/operationConfig/exportExcel', 'ALL', '手术公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-映射关系是否已存在', 'FUNC000039', '/tran/deptConfig/isExistRecord', 'ALL', '科室公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-保存或修改映射关系', 'FUNC000040', '/tran/deptConfig/saveOrUpdateRecord', 'ALL', '科室公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-批量保存或修改映射关系', 'FUNC000041', '/tran/deptConfig/saveOrUpdateRecords', 'ALL', '科室公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-删除映射关系', 'FUNC000042', '/tran/deptConfig/deleteRecord', 'ALL', '科室公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-批量删除映射关系', 'FUNC000043', '/tran/deptConfig/deleteRecords', 'ALL', '科室公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-公表数据导入', 'FUNC000044', '/tran/deptConfig/importExcel', 'ALL', '科室公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '科室公表映射-数据导出', 'FUNC000045', '/tran/deptConfig/exportExcel', 'ALL', '科室公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-医学术语检索-新增静态知识', 'FUNC000046', '/kl/conceptInfo/staticKnowledgeIndexWithoutInfo', 'ALL', '静态知识标准术语-医学术语检索-新增静态知识', '0', null);
+INSERT INTO `sys_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-获取静态知识列表', 'FUNC000047', '/kl/conceptInfo/getPage', 'ALL', '静态知识标准术语-获取静态知识列表', '0', null);
+INSERT INTO `sys_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-保存静态知识-新增或修改', 'FUNC000048', '/kl/conceptInfo/saveOrUpdateRecord', 'ALL', '静态知识标准术语-保存静态知识-新增或修改', '0', null);
+INSERT INTO `sys_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-静态知识启用禁用', 'FUNC000049', '/kl/conceptInfo/changeStatus', 'ALL', '静态知识标准术语-静态知识启用禁用', '0', null);
+INSERT INTO `sys_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-静态知识是否存在', 'FUNC000050', '/kl/conceptInfo/isExist', 'ALL', '静态知识标准术语-静态知识是否存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识标准术语-根据术语id获取静态信息', 'FUNC000051', '/kl/conceptInfo/getRecordById', 'ALL', '静态知识标准术语-根据术语id获取静态信息', '0', null);
+INSERT INTO `sys_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '关联维护设置-医院信息——修改医院信息', 'FUNC000052', '/tran/hospitalInfo/saveRecord', 'ALL', '关联维护设置-医院信息——修改医院信息', '0', null);
+INSERT INTO `sys_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息-保存更新方案配置信息', 'FUNC000053', '/sys/plan/savePlanInfoDatas', 'ALL', '方案配置信息-保存更新方案配置信息', '0', null);
+INSERT INTO `sys_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息-删除方案配置信息', 'FUNC000054', '/sys/plan/cancelPlanDatas', 'ALL', '方案配置信息-删除方案配置信息', '0', null);
+INSERT INTO `sys_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息-停用启用方案配置', 'FUNC000055', '/sys/plan/revStopPlans', 'ALL', '方案配置信息-停用启用方案配置', '0', null);
+INSERT INTO `sys_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息-获取默认方案配置', 'FUNC000056', '/sys/plan/getDefaultPlans', 'ALL', '方案配置信息-获取默认方案配置', '0', null);
+INSERT INTO `sys_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息明细-根据医院编码获取配置信息明细', 'FUNC000057', '/sys/planDetail/getPlanDetailDatas', 'ALL', '方案配置信息明细-根据医院编码获取配置信息明细', '0', null);
+INSERT INTO `sys_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息明细-保存更新方案配置信息明细', 'FUNC000058', '/sys/planDetail/savePlanDetails', 'ALL', '方案配置信息明细-保存更新方案配置信息明细', '0', null);
+INSERT INTO `sys_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息明细-删除方案配置明细', 'FUNC000059', '/sys/planDetail/cancelPlanDetails', 'ALL', '方案配置信息明细-删除方案配置明细', '0', null);
+INSERT INTO `sys_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '方案配置信息明细-停用启用方案配置明细', 'FUNC000060', '/sys/planDetail/revStopPlanDetails', 'ALL', '方案配置信息明细-停用启用方案配置明细', '0', null);
+INSERT INTO `sys_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-映射关系是否已存在', 'FUNC000061', '/tran/transfusionConfig/isExistRecord', 'ALL', '输血公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-保存或修改映射关系', 'FUNC000062', '/tran/transfusionConfig/saveOrUpdateRecord', 'ALL', '输血公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-批量保存或修改映射关系', 'FUNC000063', '/tran/transfusionConfig/saveOrUpdateRecords', 'ALL', '输血公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-删除映射关系', 'FUNC000064', '/tran/transfusionConfig/deleteRecord', 'ALL', '输血公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-批量删除映射关系', 'FUNC000065', '/tran/transfusionConfig/deleteRecords', 'ALL', '输血公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-公表数据导入', 'FUNC000066', '/tran/transfusionConfig/importExcel', 'ALL', '输血公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '输血公表映射-数据导出', 'FUNC000067', '/tran/transfusionConfig/exportExcel', 'ALL', '输血公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-映射关系是否已存在', 'FUNC000068', '/tran/scaleConfig/isExistRecord', 'ALL', '量表公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-保存或修改映射关系', 'FUNC000069', '/tran/scaleConfig/saveOrUpdateRecord', 'ALL', '量表公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-批量保存或修改映射关系', 'FUNC000070', '/tran/scaleConfig/saveOrUpdateRecords', 'ALL', '量表公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-删除映射关系', 'FUNC000071', '/tran/scaleConfig/deleteRecord', 'ALL', '量表公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-批量删除映射关系', 'FUNC000072', '/tran/scaleConfig/deleteRecords', 'ALL', '量表公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-公表数据导入', 'FUNC000073', '/tran/scaleConfig/importExcel', 'ALL', '量表公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '量表公表映射-数据导出', 'FUNC000074', '/tran/scaleConfig/exportExcel', 'ALL', '量表公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-映射关系是否已存在', 'FUNC000075', '/tran/nurseConfig/isExistRecord', 'ALL', '护理公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-保存或修改映射关系', 'FUNC000076', '/tran/nurseConfig/saveOrUpdateRecord', 'ALL', '护理公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-批量保存或修改映射关系', 'FUNC000077', '/tran/nurseConfig/saveOrUpdateRecords', 'ALL', '护理公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-删除映射关系', 'FUNC000078', '/tran/nurseConfig/deleteRecord', 'ALL', '护理公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-批量删除映射关系', 'FUNC000079', '/tran/nurseConfig/deleteRecords', 'ALL', '护理公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-公表数据导入', 'FUNC000080', '/tran/nurseConfig/importExcel', 'ALL', '护理公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '护理公表映射-数据导出', 'FUNC000081', '/tran/nurseConfig/exportExcel', 'ALL', '护理公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-映射关系是否已存在', 'FUNC000082', '/tran/tcmdiseaseConfig/isExistRecord', 'ALL', '中医疾病公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-保存或修改映射关系', 'FUNC000083', '/tran/tcmdiseaseConfig/saveOrUpdateRecord', 'ALL', '中医疾病公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-批量保存或修改映射关系', 'FUNC000084', '/tran/tcmdiseaseConfig/saveOrUpdateRecords', 'ALL', '中医疾病公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-删除映射关系', 'FUNC000085', '/tran/tcmdiseaseConfig/deleteRecord', 'ALL', '中医疾病公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-批量删除映射关系', 'FUNC000086', '/tran/tcmdiseaseConfig/deleteRecords', 'ALL', '中医疾病公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-公表数据导入', 'FUNC000087', '/tran/tcmdiseaseConfig/importExcel', 'ALL', '中医疾病公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医疾病公表映射-数据导出', 'FUNC000088', '/tran/tcmdiseaseConfig/exportExcel', 'ALL', '中医疾病公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-映射关系是否已存在', 'FUNC000089', '/tran/tcmsyndromeConfig/isExistRecord', 'ALL', '中医证候公表映射-映射关系是否已存在', '0', null);
+INSERT INTO `sys_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-保存或修改映射关系', 'FUNC000090', '/tran/tcmsyndromeConfig/saveOrUpdateRecord', 'ALL', '中医证候公表映射-保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-批量保存或修改映射关系', 'FUNC000091', '/tran/tcmsyndromeConfig/saveOrUpdateRecords', 'ALL', '中医证候公表映射-批量保存或修改映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-删除映射关系', 'FUNC000092', '/tran/tcmsyndromeConfig/deleteRecord', 'ALL', '中医证候公表映射-删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-批量删除映射关系', 'FUNC000093', '/tran/tcmsyndromeConfig/deleteRecords', 'ALL', '中医证候公表映射-批量删除映射关系', '0', null);
+INSERT INTO `sys_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-公表数据导入', 'FUNC000094', '/tran/tcmsyndromeConfig/importExcel', 'ALL', '中医证候公表映射-公表数据导入', '0', null);
+INSERT INTO `sys_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '中医证候公表映射-数据导出', 'FUNC000095', '/tran/tcmsyndromeConfig/exportExcel', 'ALL', '中医证候公表映射-数据导出', '0', null);
+INSERT INTO `sys_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '子医院维护-获取子医院信息', 'FUNC000096', '/tran/hospitalInfo/getHospitalRelation', 'ALL', '子医院维护-获取子医院信息', '0', null);
+INSERT INTO `sys_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '子医院维护-编辑子医院信息', 'FUNC000097', '/tran/hospitalInfo/saveHospitalRelation', 'ALL', '子医院维护-编辑子医院信息', '0', null);
+
+-- ----------------------------
+-- Table structure for sys_role
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role`;
+CREATE TABLE `sys_role` (
+                            `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 '角色名称',
+                            `roleLevel` int(11) NOT NULL DEFAULT '0' COMMENT '角色等级',
+                            `descritpion` varchar(255) NOT NULL DEFAULT '' COMMENT '角色描述',
+                            `menuItems` varchar(255) NOT NULL DEFAULT '' COMMENT '菜单ID:对应角色ID(暂无用处)',
+                            `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                            PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='系统角色表';
+
+-- ----------------------------
+-- Records of sys_role
+-- ----------------------------
+INSERT INTO `sys_role` VALUES ('-1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '超级管理员', '0', '', '', '');
+INSERT INTO `sys_role` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '静态知识', '0', '', '', null);
+
+-- ----------------------------
+-- Table structure for sys_role_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_menu`;
+CREATE TABLE `sys_role_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则表示纪录未修改',
+                                 `role_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '角色id',
+                                 `menu_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '菜单id',
+                                 `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                                 PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8 COMMENT='角色和菜单的映射表';
+
+-- ----------------------------
+-- Records of sys_role_menu
+-- ----------------------------
+INSERT INTO `sys_role_menu` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', null);
+INSERT INTO `sys_role_menu` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '2', null);
+INSERT INTO `sys_role_menu` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '3', null);
+INSERT INTO `sys_role_menu` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '4', null);
+INSERT INTO `sys_role_menu` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '5', null);
+INSERT INTO `sys_role_menu` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '6', null);
+INSERT INTO `sys_role_menu` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '7', null);
+INSERT INTO `sys_role_menu` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '8', null);
+INSERT INTO `sys_role_menu` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '9', null);
+INSERT INTO `sys_role_menu` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '10', null);
+INSERT INTO `sys_role_menu` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '11', null);
+INSERT INTO `sys_role_menu` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '12', null);
+INSERT INTO `sys_role_menu` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '13', null);
+INSERT INTO `sys_role_menu` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '14', null);
+INSERT INTO `sys_role_menu` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '15', null);
+INSERT INTO `sys_role_menu` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '16', null);
+INSERT INTO `sys_role_menu` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '17', null);
+INSERT INTO `sys_role_menu` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '18', null);
+INSERT INTO `sys_role_menu` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '19', null);
+INSERT INTO `sys_role_menu` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '1', null);
+INSERT INTO `sys_role_menu` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '3', null);
+INSERT INTO `sys_role_menu` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '4', null);
+INSERT INTO `sys_role_menu` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '5', null);
+INSERT INTO `sys_role_menu` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '6', null);
+INSERT INTO `sys_role_menu` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '7', null);
+INSERT INTO `sys_role_menu` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '8', null);
+INSERT INTO `sys_role_menu` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', null);
+INSERT INTO `sys_role_menu` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '17', null);
+INSERT INTO `sys_role_menu` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '18', null);
+INSERT INTO `sys_role_menu` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '19', null);
+INSERT INTO `sys_role_menu` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '20', null);
+
+-- ----------------------------
+-- Table structure for sys_role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_permission`;
+CREATE TABLE `sys_role_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则表示纪录未修改',
+                                       `role_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=193 DEFAULT CHARSET=utf8 COMMENT='角色和资源的映射表';
+
+-- ----------------------------
+-- Records of sys_role_permission
+-- ----------------------------
+INSERT INTO `sys_role_permission` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '基础功能-用户账号-获取用户、医院、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '2', '修改密码');
+INSERT INTO `sys_role_permission` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '3', '根据医院获取方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '4', '诊断公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '5', '诊断公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '6', '诊断公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '7', '诊断公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '8', '诊断公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '9', '诊断公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '10', '诊断公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '11', '化验公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('12', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '12', '化验公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '13', '化验公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '14', '化验公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '15', '化验公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '16', '化验公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '17', '化验公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('18', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '18', '辅检公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('19', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '19', '辅检公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('20', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '20', '辅检公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('21', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '21', '辅检公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('22', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '22', '辅检公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('23', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '23', '辅检公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('24', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '24', '辅检公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('25', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '25', '药品公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '26', '药品公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '27', '药品公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '28', '药品公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '29', '药品公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '30', '药品公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '31', '药品公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('32', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '32', '手术公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '33', '手术公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '34', '手术公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '35', '手术公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '36', '手术公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '37', '手术公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '38', '手术公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '39', '科室公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '40', '科室公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '41', '科室公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '42', '科室公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '43', '科室公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '44', '科室公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('45', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '45', '科室公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '46', '静态知识标准术语-医学术语检索-新增静态知识');
+INSERT INTO `sys_role_permission` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '47', '静态知识标准术语-获取静态知识列表');
+INSERT INTO `sys_role_permission` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '48', '静态知识标准术语-保存静态知识-新增或修改');
+INSERT INTO `sys_role_permission` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '49', '静态知识标准术语-静态知识启用禁用');
+INSERT INTO `sys_role_permission` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '50', '静态知识标准术语-静态知识是否存在');
+INSERT INTO `sys_role_permission` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '51', '静态知识标准术语-根据术语id获取静态信息');
+INSERT INTO `sys_role_permission` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '52', '关联维护设置-医院信息——修改医院信息');
+INSERT INTO `sys_role_permission` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '53', '方案配置信息-保存更新方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '54', '方案配置信息-删除方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '55', '方案配置信息-停用启用方案配置');
+INSERT INTO `sys_role_permission` VALUES ('56', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '56', '方案配置信息-获取默认方案配置');
+INSERT INTO `sys_role_permission` VALUES ('57', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '57', '方案配置信息明细-根据医院编码获取配置信息明细');
+INSERT INTO `sys_role_permission` VALUES ('58', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '58', '方案配置信息明细-保存更新方案配置信息明细');
+INSERT INTO `sys_role_permission` VALUES ('59', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '59', '方案配置信息明细-删除方案配置明细');
+INSERT INTO `sys_role_permission` VALUES ('60', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '60', '方案配置信息明细-停用启用方案配置明细');
+INSERT INTO `sys_role_permission` VALUES ('61', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '61', '输血公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('62', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '62', '输血公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('63', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '63', '输血公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('64', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '64', '输血公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('65', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '65', '输血公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('66', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '66', '输血公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('67', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '67', '输血公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('68', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '68', '量表公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('69', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '69', '量表公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('70', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '70', '量表公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('71', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '71', '量表公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('72', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '72', '量表公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('73', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '73', '量表公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('74', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '74', '量表公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('75', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '75', '护理公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('76', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '76', '护理公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('77', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '77', '护理公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('78', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '78', '护理公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('79', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '79', '护理公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('80', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '80', '护理公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('81', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '81', '护理公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('82', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '82', '中医疾病公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('83', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '83', '中医疾病公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('84', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '84', '中医疾病公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('85', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '85', '中医疾病公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('86', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '86', '中医疾病公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('87', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '87', '中医疾病公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('88', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '88', '中医疾病公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('89', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '89', '中医证候公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('90', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '90', '中医证候公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('91', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '91', '中医证候公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('92', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '92', '中医证候公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('93', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '93', '中医证候公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('94', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '94', '中医证候公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('95', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '95', '中医证候公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('96', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '1', '基础功能-用户账号-获取用户、医院、菜单信息');
+INSERT INTO `sys_role_permission` VALUES ('97', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '2', '修改密码');
+INSERT INTO `sys_role_permission` VALUES ('98', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '3', '根据医院获取方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('99', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '4', '诊断公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('100', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '5', '诊断公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('101', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '6', '诊断公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('102', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '7', '诊断公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('103', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '8', '诊断公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('104', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '9', '诊断公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('105', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '10', '诊断公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('106', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '11', '化验公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('107', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '12', '化验公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('108', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '13', '化验公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('109', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '14', '化验公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('110', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '15', '化验公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('111', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '16', '化验公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('112', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '17', '化验公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('113', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '18', '辅检公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('114', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '19', '辅检公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('115', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '20', '辅检公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('116', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '21', '辅检公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('117', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '22', '辅检公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('118', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '23', '辅检公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('119', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '24', '辅检公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('120', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '25', '药品公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('121', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '26', '药品公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('122', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '27', '药品公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('123', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '28', '药品公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('124', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '29', '药品公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('125', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '30', '药品公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('126', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '31', '药品公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('127', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '32', '手术公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('128', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '33', '手术公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('129', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '34', '手术公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('130', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '35', '手术公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('131', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '36', '手术公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('132', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '37', '手术公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('133', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '38', '手术公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('134', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '39', '科室公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('135', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '40', '科室公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('136', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', '科室公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('137', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', '科室公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('138', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '43', '科室公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('139', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '44', '科室公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('140', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '45', '科室公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('141', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '46', '静态知识标准术语-医学术语检索-新增静态知识');
+INSERT INTO `sys_role_permission` VALUES ('142', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '47', '静态知识标准术语-获取静态知识列表');
+INSERT INTO `sys_role_permission` VALUES ('143', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '48', '静态知识标准术语-保存静态知识-新增或修改');
+INSERT INTO `sys_role_permission` VALUES ('144', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '49', '静态知识标准术语-静态知识启用禁用');
+INSERT INTO `sys_role_permission` VALUES ('145', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '50', '静态知识标准术语-静态知识是否存在');
+INSERT INTO `sys_role_permission` VALUES ('146', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '51', '静态知识标准术语-根据术语id获取静态信息');
+INSERT INTO `sys_role_permission` VALUES ('147', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '52', '关联维护设置-医院信息——修改医院信息');
+INSERT INTO `sys_role_permission` VALUES ('148', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '53', '方案配置信息-保存更新方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('149', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '54', '方案配置信息-删除方案配置信息');
+INSERT INTO `sys_role_permission` VALUES ('150', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '55', '方案配置信息-停用启用方案配置');
+INSERT INTO `sys_role_permission` VALUES ('151', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '56', '方案配置信息-获取默认方案配置');
+INSERT INTO `sys_role_permission` VALUES ('152', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '57', '方案配置信息明细-根据医院编码获取配置信息明细');
+INSERT INTO `sys_role_permission` VALUES ('153', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '58', '方案配置信息明细-保存更新方案配置信息明细');
+INSERT INTO `sys_role_permission` VALUES ('154', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '59', '方案配置信息明细-删除方案配置明细');
+INSERT INTO `sys_role_permission` VALUES ('155', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '60', '方案配置信息明细-停用启用方案配置明细');
+INSERT INTO `sys_role_permission` VALUES ('156', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '61', '输血公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('157', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '62', '输血公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('158', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '63', '输血公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('159', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '64', '输血公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('160', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '65', '输血公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('161', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '66', '输血公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('162', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '67', '输血公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('163', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '68', '量表公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('164', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '69', '量表公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('165', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '70', '量表公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('166', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '71', '量表公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('167', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '72', '量表公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('168', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '73', '量表公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('169', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '74', '量表公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('170', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '75', '护理公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('171', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '76', '护理公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('172', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '77', '护理公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('173', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '78', '护理公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('174', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '79', '护理公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('175', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '80', '护理公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('176', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '81', '护理公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('177', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '82', '中医疾病公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('178', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '83', '中医疾病公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('179', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '84', '中医疾病公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('180', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '85', '中医疾病公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('181', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '86', '中医疾病公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('182', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '87', '中医疾病公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('183', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '88', '中医疾病公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('184', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '89', '中医证候公表映射-映射关系是否已存在');
+INSERT INTO `sys_role_permission` VALUES ('185', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '90', '中医证候公表映射-保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('186', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '91', '中医证候公表映射-批量保存或修改映射关系');
+INSERT INTO `sys_role_permission` VALUES ('187', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '92', '中医证候公表映射-删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('188', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '93', '中医证候公表映射-批量删除映射关系');
+INSERT INTO `sys_role_permission` VALUES ('189', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '94', '中医证候公表映射-公表数据导入');
+INSERT INTO `sys_role_permission` VALUES ('190', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '95', '中医证候公表映射-数据导出');
+INSERT INTO `sys_role_permission` VALUES ('191', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '96', '子医院维护-获取子医院信息');
+INSERT INTO `sys_role_permission` VALUES ('192', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '97', '子医院维护-编辑子医院信息');

+ 9 - 8
src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -4,6 +4,7 @@ import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.enums.ConceptTypeEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.facade.MappingConfigFacade;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -162,7 +163,7 @@ public class AssembleAggregate {
 
         if (ListUtil.isNotEmpty(lisHisNameList)) {
             lisConfigMap
-                    = mappingConfigFacade.groupByHisNameWithName(lisHisNameList, ConceptTypeEnum.LisPack.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(lisHisNameList, ConceptTypeEnum.LisPack.getKey(), searchData.getHospitalId(), StatusEnum.Enable.getKey());
         }
         return lisConfigMap;
     }
@@ -195,7 +196,7 @@ public class AssembleAggregate {
         Map<String, Map<String, Map<String, List<String>>>> pacsConfigMap = new HashMap<>();
         if (ListUtil.isNotEmpty(pacsHisNameList)) {
             pacsConfigMap
-                    = mappingConfigFacade.groupByHisNameWithName(pacsHisNameList, ConceptTypeEnum.Pacs.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(pacsHisNameList, ConceptTypeEnum.Pacs.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return pacsConfigMap;
     }
@@ -233,7 +234,7 @@ public class AssembleAggregate {
         Map<String, Map<String, Map<String, List<String>>>> configMap = new HashMap<>();
         if (ListUtil.isNotEmpty(diagHisNameList)) {
             configMap
-                    = mappingConfigFacade.groupByHisNameWithName(diagHisNameList, ConceptTypeEnum.Disease.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(diagHisNameList, ConceptTypeEnum.Disease.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return configMap;
     }
@@ -266,7 +267,7 @@ public class AssembleAggregate {
         Map<String, Map<String, Map<String, List<String>>>> configMap = new HashMap<>();
         if (ListUtil.isNotEmpty(drugHisNameList)) {
             configMap
-                    = mappingConfigFacade.groupByHisNameWithName(drugHisNameList, ConceptTypeEnum.Drug.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(drugHisNameList, ConceptTypeEnum.Drug.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return configMap;
     }
@@ -304,7 +305,7 @@ public class AssembleAggregate {
         Map<String, Map<String, Map<String, List<String>>>> configMap = new HashMap<>();
         if (ListUtil.isNotEmpty(operationHisNameList)) {
             configMap
-                    = mappingConfigFacade.groupByHisNameWithName(operationHisNameList, ConceptTypeEnum.Operation.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(operationHisNameList, ConceptTypeEnum.Operation.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return configMap;
     }
@@ -330,7 +331,7 @@ public class AssembleAggregate {
 
         if (ListUtil.isNotEmpty(deptHisNameList)) {
             configMap
-                    = mappingConfigFacade.groupByHisNameWithName(deptHisNameList, ConceptTypeEnum.Dept.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(deptHisNameList, ConceptTypeEnum.Dept.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return configMap;
     }
@@ -364,7 +365,7 @@ public class AssembleAggregate {
 
         if (ListUtil.isNotEmpty(transfusionHisNameList)) {
             configMap
-                    = mappingConfigFacade.groupByHisNameWithName(transfusionHisNameList, ConceptTypeEnum.Transfusion.getKey(), searchData.getHospitalId());
+                    = mappingConfigFacade.groupByHisNameWithName(transfusionHisNameList, ConceptTypeEnum.Transfusion.getKey(), searchData.getHospitalId(),StatusEnum.Enable.getKey());
         }
         return configMap;
     }
@@ -402,7 +403,7 @@ public class AssembleAggregate {
                 }
 
                 String hisDetailName = "";
-                if(type.equals(ConceptTypeEnum.LisPack.getKey())) {
+                if (type.equals(ConceptTypeEnum.LisPack.getKey())) {
                     hisDetailName = ReflectUtil.getProperty(item, "detailName");
                     if (StringUtil.isBlank(hisDetailName)) {
                         hisDetailName = "";

+ 8 - 7
src/main/java/com/diagbot/aggregate/AssemblePushAggregate.java

@@ -4,6 +4,7 @@ import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushScaleDTO;
 import com.diagbot.enums.ConceptTypeEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.facade.MappingConfigFacade;
 import com.diagbot.util.ListUtil;
 import com.google.common.collect.Lists;
@@ -85,7 +86,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.LisPack.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.LisPack.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retLis.forEach(item -> {
@@ -113,7 +114,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Pacs.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Pacs.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retPacs.forEach(item -> {
@@ -146,7 +147,7 @@ public class AssemblePushAggregate {
             }
             if (ListUtil.isNotEmpty(uniqueNameList)) {
                 Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                        = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Disease.getKey(), hospitalId);
+                        = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Disease.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
                 for (Map.Entry<String, List<PushBaseDTO>> entry : retMap.entrySet()) {
                     if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
@@ -177,7 +178,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Operation.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Operation.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retOperation.forEach(item -> {
@@ -205,7 +206,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Drug.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Drug.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retDrug.forEach(item -> {
@@ -233,7 +234,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Scale.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Scale.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retScale.forEach(item -> {
@@ -261,7 +262,7 @@ public class AssemblePushAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
-                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Nurse.getKey(), hospitalId);
+                    = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Nurse.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retNurse.forEach(item -> {

+ 9 - 0
src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -59,6 +59,15 @@ public interface CdssCoreClient {
     @PostMapping("/retrieval/index")
     RespDTO<RetrievalDTO> index(@RequestBody @Valid RetrievalVO retrievalVO);
 
+    /**
+     * 国药准字匹配
+     *
+     * @param indexByApprovalVO
+     * @return
+     */
+    @PostMapping("/retrieval/indexByApproval")
+    RespDTO<List<IndexBatchDTO>> indexByApproval(@Valid @RequestBody IndexByApprovalVO indexByApprovalVO);
+
     /**
      * 静态知识检索
      *

+ 14 - 1
src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -72,6 +72,19 @@ public class CdssCoreHystrix implements CdssCoreClient {
         return null;
     }
 
+
+    /**
+     * 国药准字匹配
+     *
+     * @param indexByApprovalVO
+     * @return
+     */
+    @Override
+    public RespDTO<List<IndexBatchDTO>> indexByApproval(@Valid @RequestBody IndexByApprovalVO indexByApprovalVO) {
+        log.error("【hystrix】调用{}异常", "indexByApproval");
+        return null;
+    }
+
     /**
      * 静态知识检索
      *
@@ -341,4 +354,4 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "getTermMatching");
         return null;
     }
-}
+}

+ 3 - 4
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -48,7 +48,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/mappingConfig/precDataMatch").permitAll()
                 .antMatchers("/tran/mappingConfig/precData").permitAll()
                 .antMatchers("/tran/mappingConfig/precDataMatch_remote").permitAll()
+                .antMatchers("/tran/mappingConfig/importExcelDataVerify").permitAll()
                 .antMatchers("/tran/mappingConfig/importExcel").permitAll()
+                .antMatchers("/tran/mappingConfig/importExcel_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/exportExcel").permitAll()
                 .antMatchers("/tran/mappingConfig/exportExcel_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/getPage").permitAll()
@@ -130,10 +132,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/klDisease/searchConceptRuleClass").permitAll()
                 .antMatchers("/cache/clearRuleAll").permitAll()
                 .antMatchers("/term/termMatching").permitAll()
-                .antMatchers("/dataPage/docking/getDataService").permitAll()
-                .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
-                .antMatchers("/dataPage/docking/getDataEngine").permitAll()
-                .antMatchers("/dataPage/docking/addUserAndRole").permitAll()
+                .antMatchers("/sys/mr/testIndication").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

+ 3 - 4
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -91,7 +91,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/mappingConfig/precDataMatch", request)
                 || matchers("/tran/mappingConfig/precData", request)
                 || matchers("/tran/mappingConfig/precDataMatch_remote", request)
+                || matchers("/tran/mappingConfig/importExcelDataVerify", request)
                 || matchers("/tran/mappingConfig/importExcel", request)
+                || matchers("/tran/mappingConfig/importExcel_remote", request)
                 || matchers("/tran/mappingConfig/exportExcel", request)
                 || matchers("/tran/mappingConfig/exportExcel_remote", request)
                 || matchers("/tran/mappingConfig/getPage", request)
@@ -172,10 +174,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/klDisease/searchConceptRuleClass", request)
                 || matchers("/cache/clearRuleAll", request)
                 || matchers("/term/termMatching", request)
-                || matchers("/dataPage/docking/getDataService", request)
-                || matchers("/dataPage/docking/getStaticKnowledge", request)
-                || matchers("/dataPage/docking/getDataEngine", request)
-                || matchers("/dataPage/docking/addUserAndRole", request)
+                || matchers("/sys/mr/testIndication", request)
                 || matchers("/", request)) {
             return true;
         }

+ 72 - 0
src/main/java/com/diagbot/dto/HospitalInfoGetDTO.java

@@ -0,0 +1,72 @@
+package com.diagbot.dto;
+
+import com.google.common.collect.Lists;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-06
+ */
+@Data
+public class HospitalInfoGetDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 状态:0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 是否对接(0-不对接,1-对接)
+     */
+    private Integer connect;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 子医院关联表
+     */
+    private List<HospitalRelationDTO> hospitalRelationDTOList = Lists.newLinkedList();
+}

+ 30 - 0
src/main/java/com/diagbot/dto/HospitalRelationDTO.java

@@ -0,0 +1,30 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 医院关联表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-06
+ */
+@Data
+public class HospitalRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 子医院名称
+     */
+    private String name;
+
+    /**
+     * 子医院编码
+     */
+    private String code;
+
+}

+ 27 - 0
src/main/java/com/diagbot/dto/HospitalRelationErrorDTO.java

@@ -0,0 +1,27 @@
+package com.diagbot.dto;
+
+import com.diagbot.vo.HospitalRelationVO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 医院关联表提示出错
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-06
+ */
+@Data
+public class HospitalRelationErrorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    // 当前医院重复
+    private List<HospitalRelationVO> errorCurrent;
+
+    // 与其他医院重复
+    private List<HospitalRelationVO> errorOther;
+}

+ 13 - 0
src/main/java/com/diagbot/dto/IndexBatchDTO.java

@@ -12,8 +12,21 @@ import lombok.Setter;
 @Setter
 public class IndexBatchDTO {
     private Long id;
+    private Integer status;
     private String name;
     private String code;
     private String synonyms;
     private Integer type;
+    /**
+     * 国药准字
+     */
+    private String approval;
+    /**
+     * 药品剂型
+     */
+    private String form;
+    /**
+     * 药品剂型id
+     */
+    private Long formConceptId;
 }

+ 1 - 1
src/main/java/com/diagbot/entity/AnesthesiaConfig.java

@@ -36,7 +36,7 @@ public class AnesthesiaConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/DeptConfig.java

@@ -83,7 +83,7 @@ public class DeptConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/DiseaseConfig.java

@@ -78,7 +78,7 @@ public class DiseaseConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null"}, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 6 - 60
src/main/java/com/diagbot/entity/DrugConfig.java

@@ -1,15 +1,10 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.diagbot.util.StringUtil;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
-import java.util.Objects;
 
 /**
  * <p>
@@ -19,8 +14,7 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-07-28
  */
-@Getter
-@Setter
+@Data
 public class DrugConfig {
     /**
      * 主键
@@ -80,68 +74,20 @@ public class DrugConfig {
      * 剂型
      */
     @Excel(name = "药品剂型", width = 60, orderNum = "3", isImportField = "true")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String form;
 
+    @Excel(name = "国药准字", width = 40, orderNum = "4", isImportField = "true")
+    private String approval;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "5", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**
      * 数据来源(1-标准词、2-同义词、3-编码、4-历史数据、5-相似词、99-数据迁移)
      */
-    @Excel(name = "数据来源【不填、标准词、同义词、编码、历史数据、相似词】", width = 20, orderNum = "5", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "数据迁移_99", "_null" }, isImportField = "true")
+    @Excel(name = "数据来源【不填、标准词、同义词、编码、历史数据、相似词、国药准字】", width = 20, orderNum = "6", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "国药准字_6", "数据迁移_99", "_null" }, isImportField = "true")
     private Integer source;
-
-    @Override
-    public String toString() {
-        return "DrugConfig{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", hospitalId=" + hospitalId +
-                ", hisName=" + hisName +
-                ", uniqueName=" + uniqueName +
-                ", code=" + code +
-                ", form=" + form +
-                "}";
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        DrugConfig drugConfig = (DrugConfig) o;
-        return Objects.equals(id, drugConfig.id)
-                && Objects.equals(isDeleted, drugConfig.isDeleted)
-                && Objects.equals(hospitalId, drugConfig.hospitalId)
-                && Objects.equals(hisName, drugConfig.hisName)
-                && Objects.equals(form, drugConfig.form)
-                && Objects.equals(uniqueName, drugConfig.uniqueName)
-                && Objects.equals(code, drugConfig.code);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, form, uniqueName, code);
-    }
-
-    public static boolean nonNull(DrugConfig o) {
-        return !(o == null
-                || (o.hospitalId == null
-                && StringUtil.isBlank(o.hisName)
-                && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.code)
-                && StringUtil.isBlank(o.form)));
-    }
 }

+ 1 - 1
src/main/java/com/diagbot/entity/LisConfig.java

@@ -87,7 +87,7 @@ public class LisConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/NurseConfig.java

@@ -81,7 +81,7 @@ public class NurseConfig{
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/OperationConfig.java

@@ -82,7 +82,7 @@ public class OperationConfig{
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/PacsConfig.java

@@ -82,7 +82,7 @@ public class PacsConfig implements Serializable {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/ScaleConfig.java

@@ -81,7 +81,7 @@ public class ScaleConfig{
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/TcmdiseaseConfig.java

@@ -82,7 +82,7 @@ public class TcmdiseaseConfig{
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 1 - 1
src/main/java/com/diagbot/entity/TcmsyndromeConfig.java

@@ -78,7 +78,7 @@ public class TcmsyndromeConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 74 - 0
src/main/java/com/diagbot/entity/TranHospitalRelation.java

@@ -0,0 +1,74 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医院关联表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+@Data
+public class TranHospitalRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 子医院编码
+     */
+    private String code;
+
+    /**
+     * 子医院名称
+     */
+    private String name;
+
+    /**
+     * 父医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 1 - 1
src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -78,7 +78,7 @@ public class TransfusionConfig {
     /**
      * 是否匹配(0-未匹配、1-已匹配)
      */
-    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1" }, isImportField = "true")
+    @Excel(name = "是否匹配【未匹配、已匹配】", width = 20, orderNum = "4", replace = { "未匹配_0", "已匹配_1", "_null" }, isImportField = "true")
     private Integer isMatch;
 
     /**

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/AnesthesiaConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.AnesthesiaConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AnesthesiaConfigWrapper extends AnesthesiaConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 24 - 0
src/main/java/com/diagbot/entity/wrapper/DeptConfigWrapper.java

@@ -0,0 +1,24 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DeptConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 14:53
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DeptConfigWrapper extends DeptConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/DiseaseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DiseaseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DiseaseConfigWrapper extends DiseaseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 28 - 0
src/main/java/com/diagbot/entity/wrapper/DrugConfigWrapper.java

@@ -0,0 +1,28 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.DrugConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DrugConfigWrapper extends DrugConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准剂型状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "100")
+    private Integer formStatus;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/LisConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.LisConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class LisConfigWrapper extends LisConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 10 - 1
src/main/java/com/diagbot/entity/wrapper/MappingConfigWrapper.java

@@ -16,8 +16,14 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class MappingConfigWrapper extends MappingConfig {
     private String uniqueName;
+    private Integer status;
     private String form;
+    private Integer formStatus;
     private String code;
+    /**
+     * 国药准字
+     */
+    private String approval;
 
    /* @Override
     public boolean equals(Object o) {
@@ -42,8 +48,11 @@ public class MappingConfigWrapper extends MappingConfig {
     public static boolean nonNull(MappingConfigWrapper o) {
         return !(o == null
                 || (StringUtil.isBlank(o.uniqueName)
+                && o.status == null
                 && StringUtil.isBlank(o.form)
-                && StringUtil.isBlank(o.code)))
+                && o.formStatus == null
+                && StringUtil.isBlank(o.code)
+                && StringUtil.isBlank(o.approval)))
                 || MappingConfig.nonNull(o);
     }
 }

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/NurseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.NurseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NurseConfigWrapper extends NurseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/OperationConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.OperationConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OperationConfigWrapper extends OperationConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/PacsConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.PacsConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PacsConfigWrapper extends PacsConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/ScaleConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.ScaleConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ScaleConfigWrapper extends ScaleConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/TcmdiseaseConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TcmdiseaseConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TcmdiseaseConfigWrapper extends TcmdiseaseConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/TcmsyndromeConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TcmsyndromeConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TcmsyndromeConfigWrapper extends TcmsyndromeConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 23 - 0
src/main/java/com/diagbot/entity/wrapper/TransfusionConfigWrapper.java

@@ -0,0 +1,23 @@
+package com.diagbot.entity.wrapper;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.diagbot.entity.TransfusionConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/9/22 15:18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class TransfusionConfigWrapper extends TransfusionConfig {
+    /**
+     * 医院诊断名称
+     */
+    @Excel(name = "标准术语状态", width = 40, replace = { "禁用_0", "启用_1", "_null" }, orderNum = "99")
+    private Integer status;
+}

+ 2 - 1
src/main/java/com/diagbot/enums/MatchSourceEnum.java

@@ -13,7 +13,8 @@ public enum MatchSourceEnum implements KeyedNamed {
     SynonymsWord(2, "同义词"),
     Code(3,"编码"),
     History(4,"历史数据"),
-    SimilarWord(5,"相似词");
+    SimilarWord(5,"相似词"),
+    Approval(6,"国药准字");
 
     @Setter
     private int key;

+ 4 - 2
src/main/java/com/diagbot/exception/ServiceErrorCode.java

@@ -18,7 +18,9 @@ public enum ServiceErrorCode implements ErrorCode {
     USER_UN_BIND_ERROR("10020006", "用户手机号未绑定无需解绑"),
     VERIFYCODE_ERROR("10020007", "图片验证码生成错误"),
     USER_EXIST("10020008", "该账号已注册"),
-    EMAIL_IS_NULL("10020009", "请输入邮箱");
+    EMAIL_IS_NULL("10020009", "请输入邮箱"),
+
+    NAME_CODE_ERROR("20020009", "操作失败,请检查【医院名称+医院编码】重复项");
 
     private String code;
     private String msg;
@@ -40,7 +42,7 @@ public enum ServiceErrorCode implements ErrorCode {
 
     public static ServiceErrorCode codeOf(String code) {
         for (ServiceErrorCode state : values()) {
-            if (state.getCode() == code) {
+            if (state.getCode().equals(code)) {
                 return state;
             }
         }

+ 7 - 7
src/main/java/com/diagbot/facade/ConceptInfoFacade.java

@@ -608,7 +608,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 1:
                 Map<String, Map<String, Map<String, List<String>>>> disConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Disease.getKey(), hospitalId);
+                        ConceptTypeEnum.Disease.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (disConfigMap != null
                         && disConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = disConfigMap.get(staticKnowledgeHISVO.getHisName())
@@ -620,7 +620,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 2:
                 Map<String, Map<String, Map<String, List<String>>>> drugConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Drug.getKey(), hospitalId);
+                        ConceptTypeEnum.Drug.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (drugConfigMap != null
                         && drugConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = drugConfigMap.get(staticKnowledgeHISVO.getHisName())
@@ -633,7 +633,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 4:
                 Map<String, Map<String, Map<String, List<String>>>> lisConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.LisPack.getKey(), hospitalId);
+                        ConceptTypeEnum.LisPack.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (lisConfigMap != null) {
                     if (StringUtil.isBlank(staticKnowledgeHISVO.getHisDetailName())) {
                         staticKnowledgeHISVO.setHisDetailName("");
@@ -652,7 +652,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 6:
                 Map<String, Map<String, Map<String, List<String>>>> pacsConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Pacs.getKey(), hospitalId);
+                        ConceptTypeEnum.Pacs.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (pacsConfigMap != null
                         && pacsConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = pacsConfigMap.get(staticKnowledgeHISVO.getHisName())
@@ -664,7 +664,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 7:
                 Map<String, Map<String, Map<String, List<String>>>> operationConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Operation.getKey(), hospitalId);
+                        ConceptTypeEnum.Operation.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (operationConfigMap != null &&
                         operationConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = operationConfigMap.get(staticKnowledgeHISVO.getHisName())
@@ -676,7 +676,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 8:
                 Map<String, Map<String, Map<String, List<String>>>> scaleConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Scale.getKey(), hospitalId);
+                        ConceptTypeEnum.Scale.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (scaleConfigMap != null &&
                         scaleConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = scaleConfigMap.get(staticKnowledgeHISVO.getHisName())
@@ -688,7 +688,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             case 9:
                 Map<String, Map<String, Map<String, List<String>>>> nurseConfigMap
                         = mappingConfigFacade.groupByHisNameWithName(ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }),
-                        ConceptTypeEnum.Nurse.getKey(), hospitalId);
+                        ConceptTypeEnum.Nurse.getKey(), hospitalId,StatusEnum.Enable.getKey());
                 if (nurseConfigMap != null &&
                         nurseConfigMap.get(staticKnowledgeHISVO.getHisName()) != null) {
                     nameList = nurseConfigMap.get(staticKnowledgeHISVO.getHisName())

+ 142 - 0
src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -3,23 +3,38 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.HospitalInfoGetDTO;
+import com.diagbot.dto.HospitalRelationDTO;
+import com.diagbot.dto.HospitalRelationErrorDTO;
 import com.diagbot.entity.HospitalInfo;
+import com.diagbot.entity.TranHospitalRelation;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.TranHospitalRelationService;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.SysUserUtils;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.HospitalCheckVO;
+import com.diagbot.vo.HospitalInfoSaveVO;
 import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.HospitalRelationVO;
 import com.diagbot.vo.HospitalSaveVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -29,6 +44,10 @@ import java.util.List;
 @Component
 public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 
+    @Autowired
+    @Qualifier("tranHospitalRelationServiceImpl")
+    TranHospitalRelationService tranHospitalRelationService;
+
     /**
      * @param hospitalInfoVO
      * @return
@@ -114,4 +133,127 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
         data = BeanUtil.listCopyTo(list, HospitalInfoDTO.class);
         return data;
     }
+
+    /**
+     * 获取子医院信息
+     *
+     * @return
+     */
+    public HospitalInfoGetDTO getHospitalRelation() {
+        HospitalInfoGetDTO hospitalInfoGetDTO = new HospitalInfoGetDTO();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+
+        // 查询主表
+        HospitalInfo one = this.getOne(new QueryWrapper<HospitalInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", hospitalId), false);
+        if (one == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "数据不存在");
+        }
+        BeanUtil.copyProperties(one, hospitalInfoGetDTO);
+
+        // 查询关联表
+        List<TranHospitalRelation> relationList = tranHospitalRelationService.list(new QueryWrapper<TranHospitalRelation>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+        );
+        List<HospitalRelationDTO> hospitalRelationDTOList = BeanUtil.listCopyTo(relationList, HospitalRelationDTO.class);
+        hospitalInfoGetDTO.setHospitalRelationDTOList(hospitalRelationDTOList);
+        return hospitalInfoGetDTO;
+    }
+
+    /**
+     * 保存
+     *
+     * @param hospitalInfoSaveVO
+     * @return
+     */
+    public HospitalRelationErrorDTO saveHospitalRelation(HospitalInfoSaveVO hospitalInfoSaveVO) {
+        Long curHospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+        // 查询主表
+        HospitalInfo one = this.getOne(new QueryWrapper<HospitalInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", curHospitalId), false);
+        if (one == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "数据不存在");
+        }
+
+        // 获取子医院
+        List<HospitalRelationVO> hospitalRelationVOList = hospitalInfoSaveVO.getHospitalRelationVOList();
+        // 校验子医院
+        HospitalRelationErrorDTO res = checkRelationHospital(hospitalRelationVOList, curHospitalId);
+        if (res != null) {
+            return res;
+        }
+
+        // 先删除子医院关联表
+        tranHospitalRelationService.remove(new QueryWrapper<TranHospitalRelation>().eq("hospital_id", curHospitalId));
+
+        // 插入子医院关联表
+        List<TranHospitalRelation> saveRelationList = Lists.newArrayList();
+        String userId = UserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
+        for (HospitalRelationVO hospitalRelationVO : hospitalRelationVOList) {
+            TranHospitalRelation tranHospitalRelation = new TranHospitalRelation();
+            BeanUtil.copyProperties(hospitalRelationVO, tranHospitalRelation);
+            tranHospitalRelation.setHospitalId(curHospitalId);
+            tranHospitalRelation.setCreator(userId);
+            tranHospitalRelation.setModifier(userId);
+            tranHospitalRelation.setGmtCreate(now);
+            tranHospitalRelation.setGmtModified(now);
+            saveRelationList.add(tranHospitalRelation);
+        }
+        if (ListUtil.isNotEmpty(saveRelationList)) {
+            tranHospitalRelationService.saveBatch(saveRelationList);
+        }
+        return null;
+    }
+
+    /**
+     * 校验子医院
+     *
+     * @param hospitalRelationVOList
+     * @param curHospitalId
+     * @return
+     */
+    public HospitalRelationErrorDTO checkRelationHospital(List<HospitalRelationVO> hospitalRelationVOList, Long curHospitalId) {
+        HospitalRelationErrorDTO res = new HospitalRelationErrorDTO();
+        if (ListUtil.isNotEmpty(hospitalRelationVOList)) {
+            // 校验name+code唯一性
+            List<TranHospitalRelation> tranHospitalRelationList = tranHospitalRelationService.list(new QueryWrapper<TranHospitalRelation>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+            );
+            Map<String, Long> relationMap = tranHospitalRelationList.stream().collect(
+                    Collectors.toMap(k -> k.getName().toUpperCase() + "_" + k.getCode().toUpperCase(), v -> v.getHospitalId(), (v1, v2) -> (v2), LinkedHashMap::new));
+            List<String> keyExist = Lists.newArrayList(); // 避免重复数据返回
+            List<String> keyAll = Lists.newArrayList(); // 当前医院所有key
+            List<HospitalRelationVO> errorOther = Lists.newArrayList(); // 与其他医院重复
+            List<HospitalRelationVO> errorCurrent = Lists.newArrayList(); // 当前医院重复
+
+            for (HospitalRelationVO hospitalRelationVO : hospitalRelationVOList) {
+                // 联合key
+                String unionKey = hospitalRelationVO.getName().toUpperCase() + "_" + hospitalRelationVO.getCode().toUpperCase();
+                // 判断当前医院重复
+                if (keyAll.contains(unionKey)) {
+                    errorCurrent.add(hospitalRelationVO);
+                } else {
+                    keyAll.add(unionKey);
+                }
+                // 判断与其他医院重复
+                Long hospitalId = relationMap.get(unionKey);
+                if (hospitalId != null && !hospitalId.equals(curHospitalId) && !keyExist.contains(unionKey)) {
+                    errorOther.add(hospitalRelationVO);
+                    keyExist.add(unionKey);
+                }
+            }
+
+            // 有错误,直接返回
+            if (ListUtil.isNotEmpty(errorOther) || ListUtil.isNotEmpty(errorCurrent)) {
+                res.setErrorOther(errorOther);
+                res.setErrorCurrent(errorCurrent);
+                return res;
+            }
+        }
+        return null;
+    }
 }

+ 10 - 7
src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -132,13 +132,16 @@ public class KlConceptStaticFacade {
             StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
             BeanUtil.copyProperties(staticKnowledgeHISVO, staticKnowledgeVO);
             staticKnowledgeVO.setName(uniqueName);
-            StaticKnowledgeDTO staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
-            if (staticKnowledgeDTO != null) {
-                StaticKnowledgeHISDTO staticKnowledgeHISDTO = new StaticKnowledgeHISDTO();
-                BeanUtil.copyProperties(staticKnowledgeDTO, staticKnowledgeHISDTO);
-                staticKnowledgeHISDTO.setHisName(staticKnowledgeHISVO.getHisName());
-                staticKnowledgeHISDTO.setHisDetailName(staticKnowledgeHISVO.getHisDetailName());
-                retList.add(staticKnowledgeHISDTO);
+            try {
+                StaticKnowledgeDTO staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
+                if (staticKnowledgeDTO != null) {
+                    StaticKnowledgeHISDTO staticKnowledgeHISDTO = new StaticKnowledgeHISDTO();
+                    BeanUtil.copyProperties(staticKnowledgeDTO, staticKnowledgeHISDTO);
+                    staticKnowledgeHISDTO.setHisName(staticKnowledgeHISVO.getHisName());
+                    staticKnowledgeHISDTO.setHisDetailName(staticKnowledgeHISVO.getHisDetailName());
+                    retList.add(staticKnowledgeHISDTO);
+                }
+            } catch (CommonException e) {
             }
         }
         return retList;

File diff suppressed because it is too large
+ 1084 - 332
src/main/java/com/diagbot/facade/MappingConfigFacade.java


+ 14 - 0
src/main/java/com/diagbot/facade/TranHospitalRelationFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.TranHospitalRelationServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhoutg
+ * @Description:
+ * @date 2020-07-29 11:08
+ */
+@Component
+public class TranHospitalRelationFacade extends TranHospitalRelationServiceImpl {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/TranHospitalRelationMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.TranHospitalRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 医院关联表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+public interface TranHospitalRelationMapper extends BaseMapper<TranHospitalRelation> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/TranHospitalRelationService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.TranHospitalRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 医院关联表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+public interface TranHospitalRelationService extends IService<TranHospitalRelation> {
+
+}

+ 3 - 2
src/main/java/com/diagbot/service/impl/MrServiceImpl.java

@@ -4,6 +4,7 @@ import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.TcmDTO;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.OtherIndexEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.facade.MappingConfigFacade;
@@ -143,7 +144,7 @@ public class MrServiceImpl implements MrService {
                 tcmdisease.setName(otherIndex.get(OtherIndexEnum.getName(OtherIndexEnum.TcmDiag.getKey())));
                 Map<String, Map<String, Map<String, List<String>>>> configMap
                         = mappingConfigFacade.groupByHisNameWithName(Arrays.asList(new String[] { tcmdisease.getName() }),
-                        ConceptTypeEnum.Tcmdisease.getKey(), hospitalId);
+                        ConceptTypeEnum.Tcmdisease.getKey(), hospitalId, StatusEnum.Enable.getKey());
                 if (configMap != null && configMap.get(tcmdisease.getName()) != null) {
                     tcmdisease.setUniqueName(configMap.get(tcmdisease.getName())
                             .get("")
@@ -162,7 +163,7 @@ public class MrServiceImpl implements MrService {
                 tcmsyndrome.setName(otherIndex.get(OtherIndexEnum.getName(OtherIndexEnum.TcmSyndrome.getKey())));
                 Map<String, Map<String, Map<String, List<String>>>> configMap
                         = mappingConfigFacade.groupByHisNameWithName(Arrays.asList(new String[] { tcmsyndrome.getName() }),
-                        ConceptTypeEnum.Tcmsyndrome.getKey(), hospitalId);
+                        ConceptTypeEnum.Tcmsyndrome.getKey(), hospitalId, StatusEnum.Enable.getKey());
                 if (configMap != null && configMap.get(tcmsyndrome.getName()) != null) {
                     tcmsyndrome.setUniqueName(configMap.get(tcmsyndrome.getName())
                             .get("")

+ 1 - 1
src/main/java/com/diagbot/service/impl/SysTokenServiceImpl.java

@@ -57,7 +57,7 @@ public class SysTokenServiceImpl implements SysTokenService {
      */
     @Override
     public Boolean createToken(JwtStore token) {
-        DecodedJWT jwt = JwtUtil.decodedJWT(token.getRefreshToken());
+        DecodedJWT jwt = JwtUtil.decodedJWT(token.getAccessToken());
         Map<String, Claim> claims = jwt.getClaims();
         String userId = claims.get("user_id").asInt().toString();
         Date expDate = claims.get("exp").asDate();

+ 20 - 0
src/main/java/com/diagbot/service/impl/TranHospitalRelationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.TranHospitalRelation;
+import com.diagbot.mapper.TranHospitalRelationMapper;
+import com.diagbot.service.TranHospitalRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 医院关联表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+@Service
+public class TranHospitalRelationServiceImpl extends ServiceImpl<TranHospitalRelationMapper, TranHospitalRelation> implements TranHospitalRelationService {
+
+}

+ 1 - 0
src/main/java/com/diagbot/vo/ConceptVO.java

@@ -17,4 +17,5 @@ public class ConceptVO {
     private List<String> names;
     private Integer type;
     private Integer source;
+    private Integer status;
 }

+ 1 - 0
src/main/java/com/diagbot/vo/FilterVO.java

@@ -15,4 +15,5 @@ import javax.validation.constraints.NotBlank;
 public class FilterVO {
     @NotBlank(message = "请输入检索内容")
     private String inputStr;
+    private Integer status;
 }

+ 61 - 0
src/main/java/com/diagbot/vo/HospitalInfoSaveVO.java

@@ -0,0 +1,61 @@
+package com.diagbot.vo;
+
+import com.google.common.collect.Lists;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-08-06
+ */
+@Data
+public class HospitalInfoSaveVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    // /**
+    //  * 主键
+    //  */
+    // private Long id;
+
+    // /**
+    //  * 医院名称
+    //  */
+    // @NotBlank(message = "医院名称不能为空")
+    // private String name;
+    //
+    // /**
+    //  * 医院地址
+    //  */
+    // private String address;
+    //
+    // /**
+    //  * 医院名称拼音
+    //  */
+    // private String spell;
+    //
+    // /**
+    //  * 状态:0.禁用1.启用
+    //  */
+    // private Integer status;
+    //
+    // /**
+    //  * 是否对接(0-不对接,1-对接)
+    //  */
+    // private Integer connect;
+    //
+    // /**
+    //  * 备注
+    //  */
+    // private String remark;
+
+    /**
+     * 子医院关联表
+     */
+    private List<HospitalRelationVO> hospitalRelationVOList = Lists.newLinkedList();
+}

+ 32 - 0
src/main/java/com/diagbot/vo/HospitalRelationVO.java

@@ -0,0 +1,32 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 医院关联表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-06
+ */
+@Data
+public class HospitalRelationVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 子医院名称
+     */
+    @NotBlank(message = "子医院名称不能为空")
+    private String name;
+
+    /**
+     * 子医院编码
+     */
+    @NotBlank(message = "子医院编码不能为空")
+    private String code;
+
+}

+ 18 - 0
src/main/java/com/diagbot/vo/IndexByApprovalVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/8/24 15:49
+ */
+@Data
+public class IndexByApprovalVO {
+    /**
+     * 国药准字列表
+     */
+    private List<String> approvalList;
+}

+ 14 - 0
src/main/java/com/diagbot/vo/MappingConfigPageVO.java

@@ -48,6 +48,8 @@ public class MappingConfigPageVO extends Page {
     private String uniqueName;
     @ApiModelProperty(hidden = true)
     private List<Long> conceptIds;
+    @ApiModelProperty(hidden = true)
+    private List<Long> notInConceptIds;
 
     /**
      * 药品剂型
@@ -55,6 +57,8 @@ public class MappingConfigPageVO extends Page {
     private String form;
     @ApiModelProperty(hidden = true)
     private List<Long> formConceptIds;
+    @ApiModelProperty(hidden = true)
+    private List<Long> notInFormConceptIds;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配、2-多条匹配)
@@ -71,4 +75,14 @@ public class MappingConfigPageVO extends Page {
      */
     @ApiModelProperty(hidden = true)
     private Integer isMultiple;
+
+    /**
+     * 标准术语启用禁用状态
+     */
+    private Integer status;
+
+    /**
+     * 剂型启用禁用状态
+     */
+    private Integer formStatus;
 }

+ 26 - 0
src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -3,10 +3,14 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.HospitalInfoGetDTO;
+import com.diagbot.dto.HospitalRelationErrorDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.HospitalInfo;
+import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.facade.HospitalInfoFacade;
 import com.diagbot.vo.HospitalCheckVO;
+import com.diagbot.vo.HospitalInfoSaveVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.HospitalSaveVO;
 import io.swagger.annotations.Api;
@@ -90,4 +94,26 @@ public class HospitalInfoController {
         List<HospitalInfoDTO> data = hospitalInfoFacade.getAllEnableHospitalInfo();
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "获取子医院信息[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getHospitalRelation")
+    @SysLogger("getHospitalRelation")
+    public RespDTO<HospitalInfoGetDTO> getHospitalRelation() {
+        return RespDTO.onSuc(hospitalInfoFacade.getHospitalRelation());
+    }
+
+    @ApiOperation(value = "编辑子医院信息[by:zhoutg]", notes = "")
+    @PostMapping("/saveHospitalRelation")
+    @SysLogger("saveHospitalRelation")
+    @Transactional
+    public RespDTO<HospitalRelationErrorDTO> saveHospitalRelation(@RequestBody @Valid HospitalInfoSaveVO hospitalInfoSaveVO) {
+        HospitalRelationErrorDTO errorData = hospitalInfoFacade.saveHospitalRelation(hospitalInfoSaveVO);
+        if (errorData != null) {
+            return RespDTO.onSucBoth(ServiceErrorCode.NAME_CODE_ERROR.getCode(),
+                    "操作失败,请检查【医院名称+医院编码】重复项",
+                    errorData);
+        }
+        return RespDTO.onSuc(errorData);
+    }
 }

+ 41 - 7
src/main/java/com/diagbot/web/MappingConfigController.java

@@ -85,11 +85,11 @@ public class MappingConfigController {
     }
 
     @ApiOperation(value = "预匹配(非文件匹配)[by:zhaops]",
-            notes = "type(必填): 类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>"+
+            notes = "type(必填): 类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>" +
                     "hisName(必填):医院术语名称 <br>" +
                     "hisDetailName(选填):医院术语名称-细项 <br>" +
                     "code(选填):诊断ICD10编码、手术编码、中医疾病编码、中医证候编码 <br>" +
-                    "approval(选填):药品国药准字 <br>" )
+                    "approval(选填):药品国药准字 <br>")
     @PostMapping(value = "/precData")
     @SysLogger("precData")
     public RespDTO<List<MappingConfigWrapper>> precData(@Valid @RequestBody PrecDataVO precDataVO) {
@@ -97,6 +97,21 @@ public class MappingConfigController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "数据导入校验[by:zhaops]",
+            notes = "file(必填):导入文件 <br>" +
+                    "hospitalId(必填):医院id <br>" +
+                    "uesrId(必填):操作人id <br>" +
+                    "type(必填): 类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>")
+    @PostMapping(value = "/importExcelDataVerify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SysLogger("importExcelDataVerify")
+    public RespDTO<Boolean> importExcelDataVerify(@RequestParam("file") MultipartFile file,
+                                                  @RequestParam("hospitalId") Long hospitalId,
+                                                  @RequestParam("type") Integer type,
+                                                  @RequestParam("uesrId") String userId) {
+        Boolean data = mappingConfigFacade.importExcelDataVerify(file, hospitalId, type, userId);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "数据导入[by:zhaops]",
             notes = "file(必填):导入文件 <br>" +
                     "hospitalId(必填):医院id <br>" +
@@ -105,11 +120,30 @@ public class MappingConfigController {
     @PostMapping(value = "/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SysLogger("importExcel")
     @Transactional
-    public RespDTO<Boolean> importExcel(@RequestParam("file") MultipartFile file,
-                                        @RequestParam("hospitalId") Long hospitalId,
-                                        @RequestParam("type") Integer type,
-                                        @RequestParam("uesrId") String userId) {
-        Boolean data = mappingConfigFacade.importExcel(file, hospitalId, type, userId);
+    public void importExcel(HttpServletResponse response,
+                            @RequestParam("file") MultipartFile file,
+                            @RequestParam("hospitalId") Long hospitalId,
+                            @RequestParam("type") Integer type,
+                            @RequestParam("uesrId") String userId) {
+        response.setHeader("Access-Control-Expose-Headers", "*");
+        mappingConfigFacade.importExcel(response, file, hospitalId, type, userId);
+    }
+
+    @ApiOperation(value = "数据导入_远程调用[by:zhaops]",
+            notes = "file(必填):导入文件 <br>" +
+                    "hospitalId(必填):医院id <br>" +
+                    "uesrId(必填):操作人id <br>" +
+                    "type(必填): 类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉 <br>")
+    @PostMapping(value = "/importExcel_remote", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @SysLogger("importExcel_remote")
+    @Transactional
+    @ApiIgnore
+    public RespDTO<List<MappingConfigWrapper>> importExcel_remote(HttpServletResponse response,
+                                                                  @RequestParam("file") MultipartFile file,
+                                                                  @RequestParam("hospitalId") Long hospitalId,
+                                                                  @RequestParam("type") Integer type,
+                                                                  @RequestParam("uesrId") String userId) {
+        List<MappingConfigWrapper> data = mappingConfigFacade.importExcel_remote(response, file, hospitalId, type, userId);
         return RespDTO.onSuc(data);
     }
 

+ 18 - 0
src/main/java/com/diagbot/web/MrController.java

@@ -5,6 +5,9 @@ import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TcmDTO;
 import com.diagbot.facade.MrFacade;
+import com.diagbot.facade.PushFacade;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.MrVO;
 import com.diagbot.vo.PushJoinVO;
 import io.swagger.annotations.Api;
@@ -30,6 +33,8 @@ public class MrController {
 
 	@Autowired
 	private MrFacade mrFacade;
+	@Autowired
+	private PushFacade pushFacade;
 
 	@ApiOperation(value = "保存病历信息:[by:gaodm]",
 			notes = "")
@@ -62,4 +67,17 @@ public class MrController {
 	public RespDTO<IndicationDTO> getIndicationMr(@RequestBody @Valid MrVO mrVO) {
 		return RespDTO.onSuc(mrFacade.getIndicationMr(mrVO));
 	}
+
+	@ApiOperation(value = "根据病历编号测试开单 :[by:zhoutg]",
+			notes = "mrId: 病历编号,必填<br>")
+	@PostMapping("/testIndication")
+	@SysLogger("testIndication")
+	public RespDTO<IndicationDTO> testIndication(@RequestBody @Valid MrVO mrVO) {
+		PushJoinVO pushJoinVO = mrFacade.getMr(mrVO.getMrId());
+		IndicationPushVO indicationPushVO = new IndicationPushVO();
+		BeanUtil.copyProperties(pushJoinVO, indicationPushVO);
+		indicationPushVO.setRuleType("1,2,3,4");
+		IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
+		return RespDTO.onSuc(indicationDTO);
+	}
 }

+ 20 - 0
src/main/java/com/diagbot/web/TranHospitalRelationController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 医院关联表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-10-09
+ */
+@Controller
+@RequestMapping("/tranHospitalRelation")
+public class TranHospitalRelationController {
+
+}

+ 30 - 0
src/main/resources/mapper/MappingConfigMapper.xml

@@ -50,6 +50,13 @@
                 #{conceptId}
             </foreach>
         </if>
+        <if test="mappingConfigPageVO.notInConceptIds!=null and mappingConfigPageVO.notInConceptIds.size()>0">
+            and a.concept_id is not null
+            and a.concept_id not in
+            <foreach item="notInConceptId" collection="mappingConfigPageVO.notInConceptIds" open="(" separator="," close=")">
+                #{notInConceptId}
+            </foreach>
+        </if>
         <if test="mappingConfigPageVO.formConceptIds!=null and mappingConfigPageVO.formConceptIds.size()>0">
             and a.form_concept_id in
             <foreach item="formConceptId" collection="mappingConfigPageVO.formConceptIds" open="(" separator=","
@@ -57,6 +64,14 @@
                 #{formConceptId}
             </foreach>
         </if>
+        <if test="mappingConfigPageVO.notInFormConceptIds!=null and mappingConfigPageVO.notInFormConceptIds.size()>0">
+            and a.form_concept_id is not null
+            and a.form_concept_id in
+            <foreach item="notInFormConceptId" collection="mappingConfigPageVO.notInFormConceptIds" open="(" separator=","
+                     close=")">
+                #{notInFormConceptId}
+            </foreach>
+        </if>
         <if test="mappingConfigPageVO.isMatch!=null">
             and a.is_match=#{mappingConfigPageVO.isMatch}
         </if>
@@ -86,6 +101,13 @@
                     #{conceptId}
                 </foreach>
             </if>
+            <if test="mappingConfigPageVO.notInConceptIds!=null and mappingConfigPageVO.notInConceptIds.size()>0">
+                and a.concept_id is not null
+                and a.concept_id not in
+                <foreach item="notInConceptId" collection="mappingConfigPageVO.notInConceptIds" open="(" separator="," close=")">
+                    #{notInConceptId}
+                </foreach>
+            </if>
             <if test="mappingConfigPageVO.formConceptIds!=null and mappingConfigPageVO.formConceptIds.size()>0">
                 and a.form_concept_id in
                 <foreach item="formConceptId" collection="mappingConfigPageVO.formConceptIds" open="(" separator=","
@@ -93,6 +115,14 @@
                     #{formConceptId}
                 </foreach>
             </if>
+            <if test="mappingConfigPageVO.notInFormConceptIds!=null and mappingConfigPageVO.notInFormConceptIds.size()>0">
+                and a.form_concept_id is not null
+                and a.form_concept_id in
+                <foreach item="notInFormConceptId" collection="mappingConfigPageVO.notInFormConceptIds" open="(" separator=","
+                         close=")">
+                    #{notInFormConceptId}
+                </foreach>
+            </if>
             group by a.his_name
             <if test="mappingConfigPageVO.type!=null and mappingConfigPageVO.type==1">
                 ,a.his_detail_name

+ 19 - 0
src/main/resources/mapper/TranHospitalRelationMapper.xml

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

+ 6 - 5
src/test/java/com/diagbot/CodeGeneration.java

@@ -27,13 +27,14 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("C://code//cdss");
+        gc.setOutputDir("E://code//cdss");
+        // gc.setOutputDir(System.getProperty("user.dir") + "//src//main//java");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
+        gc.setAuthor("zhoutg");// 作者
 
         // 自定义文件命名,注意 %s 会自动填充表实体属性!
         gc.setControllerName("%sController");
@@ -49,14 +50,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix(new String[] { "demo_" });// 此处可以修改为您的表前缀
+        // strategy.setTablePrefix(new String[] { "demo_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "tran_datadocking_log"}); // 需要生成的表
+        strategy.setInclude(new String[] { "tran_hospital_relation"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);