Merge remote-tracking branch 'origin/dev/formula_20220301' into dev/formula_20220301

doc/027.20220301医学计算公式/cdss_init.sql

@@ -13,7 +13,7 @@ USE `cdss`;
  Target Server Version : 50736
  File Encoding         : 65001
 
- Date: 01/03/2022 17:32:17
+ Date: 09/03/2022 14:09:02
 */
 
 SET NAMES utf8mb4;
@@ -61,13 +61,13 @@ INSERT INTO `sys_dictionary_info` VALUES (16, 'N', '1970-01-01 12:00:00', '1970-
 INSERT INTO `sys_dictionary_info` VALUES (17, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 9, '胶囊剂', '4', 0, 40, '药品剂型');
 INSERT INTO `sys_dictionary_info` VALUES (18, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 9, '滴丸剂', '5', 0, 50, '药品剂型');
 INSERT INTO `sys_dictionary_info` VALUES (19, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 8, '检查子项', '辅助检查子项目名称', 0, 5, '图谱标签与页面显示类型对应关系');
-INSERT INTO `sys_dictionary_info` VALUES (21, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '诊断', '1', 0, 1, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (22, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '药品', '2', 0, 2, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (23, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验套餐', '3', 0, 3, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (24, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验细项', '4', 0, 4, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (25, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查', '5', 0, 5, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (26, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查子项', '6', 0, 6, '静态知识类型');
-INSERT INTO `sys_dictionary_info` VALUES (27, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '手术和操作', '7', 0, 7, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (21, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '诊断', '1', 1, 1, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (22, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '药品', '2', 1, 2, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (23, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验套餐', '3', 1, 3, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (24, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验细项', '4', 1, 4, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (25, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查', '5', 1, 5, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (26, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查子项', '6', 1, 6, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (27, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '手术和操作', '7', 1, 7, '静态知识类型');
 INSERT INTO `sys_dictionary_info` VALUES (28, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 8, '药品类别', '药品类别', 0, 20, '图谱标签与页面显示类型对应关系');
 INSERT INTO `sys_dictionary_info` VALUES (29, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 11, '检验套餐', '1', 0, 1, '开单合理项检索类型');
 INSERT INTO `sys_dictionary_info` VALUES (30, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 11, '检查', '2', 0, 2, '开单合理项检索类型');
@@ -165,13 +165,13 @@ INSERT INTO `sys_dictionary_info` VALUES (121, 'N', '1970-01-01 12:00:00', '1970
 INSERT INTO `sys_dictionary_info` VALUES (122, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查类别根节点', '辅助检查类别根节点', 1, 409, '页面显示词性');
 INSERT INTO `sys_dictionary_info` VALUES (123, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '年龄', '年龄', 1, 410, '页面显示词性');
 INSERT INTO `sys_dictionary_info` VALUES (124, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 7, '量表/医学计算公式', '8', 2, 80, '静态知识检索类型');
-INSERT INTO `sys_dictionary_info` VALUES (125, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '量表', '8', 0, 8, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (125, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '量表', '8', 1, 8, '静态知识类型');
 INSERT INTO `sys_dictionary_info` VALUES (126, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 7, '护理', '9', 2, 90, '静态知识检索类型');
-INSERT INTO `sys_dictionary_info` VALUES (127, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '护理', '9', 0, 9, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (127, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '护理', '9', 1, 9, '静态知识类型');
 INSERT INTO `sys_dictionary_info` VALUES (128, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 50, '否', '0', 1, 1, '是否选项');
 INSERT INTO `sys_dictionary_info` VALUES (129, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 50, '是', '1', 1, 2, '是否选项');
 INSERT INTO `sys_dictionary_info` VALUES (130, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 7, '政策法规', '10', 2, 100, '静态知识检索类型');
-INSERT INTO `sys_dictionary_info` VALUES (131, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '政策法规', '10', 0, 10, '静态知识类型');
+INSERT INTO `sys_dictionary_info` VALUES (131, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '政策法规', '10', 1, 10, '静态知识类型');
 INSERT INTO `sys_dictionary_info` VALUES (132, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '政策法规', '政策法规', 1, 411, '页面显示词性');
 INSERT INTO `sys_dictionary_info` VALUES (133, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 60, '默认方案', 'plan_default', 1, 0, '电子方案配置');
 INSERT INTO `sys_dictionary_info` VALUES (134, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 60, '输入位置-基本信息', 'info', 1, 0, '电子方案配置');

doc/027.20220301医学计算公式/med_2021_init.sql

@@ -13,7 +13,7 @@ USE `med_2021`;
  Target Server Version : 50736
  File Encoding         : 65001
 
- Date: 01/03/2022 17:31:50
+ Date: 09/03/2022 13:20:53
 */
 
 SET NAMES utf8mb4;
@@ -37,55 +37,62 @@ CREATE TABLE `kl_dictionary_info`  (
                                        `order_no` int(11) NOT NULL DEFAULT 0 COMMENT '排序号',
                                        `remark` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
                                        PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 378 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 387 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of kl_dictionary_info
 -- ----------------------------
-INSERT INTO `kl_dictionary_info` VALUES (80, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '诊断', '疾病', 1, 100, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (81, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品', '药品通用名', 1, 101, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (82, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品剂型', '药品剂型', 1, 102, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (83, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状', '症状', 1, 103, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (84, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '体格检查项目', '体格检查项目', 1, 104, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (85, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '体格检查结果', '体格检查结果', 1, 105, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (86, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作', '手术和操作', 1, 106, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (87, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检验套餐', '实验室检查套餐', 1, 107, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (88, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检验细项', '实验室检查子项目', 1, 108, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (89, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检查', '辅助检查项目', 1, 109, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (90, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检查子项', '辅助检查子项目', 1, 110, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (91, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查描述', '辅助检查描述', 1, 111, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (92, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查结果', '辅助检查结果', 1, 112, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (93, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '输血类型', '输血类型', 1, 113, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (94, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '麻醉', '麻醉', 1, 114, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (95, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '科室', '科室', 1, 115, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (96, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '性别', '性别', 1, 116, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (97, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '人群', '人群', 1, 117, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (98, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '食物', '食物', 1, 118, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (99, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '其他过敏原', '其他过敏原', 1, 119, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (100, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '医疗器械及物品', '医疗器械及物品', 1, 120, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (101, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '给药途径', '给药途径', 1, 121, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (102, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '部位', '部位', 1, 122, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (103, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '护理', '护理', 1, 123, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (104, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '量表/医学计算公式', '量表', 1, 124, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (105, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '单位', '单位', 1, 125, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (106, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, 'ICD10疾病类别', 'ICD10疾病类别', 1, 300, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (107, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品化学物质类别', '药品化学物质类别', 1, 301, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (108, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品治疗学类别', '药品治疗学类别', 1, 302, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (109, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品药理学类别', '药品药理学类别', 1, 303, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (110, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品解剖学类别', '药品解剖学类别', 1, 304, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (111, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状类别', '症状类别', 1, 305, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (112, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作类别', '手术和操作类别', 1, 306, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (113, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, 'ICD10疾病类别根节点', 'ICD10疾病类别根节点', 1, 400, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (114, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '科室疾病类别根节点', '科室疾病类别根节点', 1, 401, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (115, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品化学物质类别根节点', '药品化学物质类别根节点', 1, 402, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (116, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品治疗学类别根节点', '药品治疗学类别根节点', 1, 403, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (117, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品药理学类别根节点', '药品药理学类别根节点', 1, 404, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (118, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品解剖学类别根节点', '药品解剖学类别根节点', 1, 405, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (119, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状类别根节点', '症状类别根节点', 1, 406, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (120, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作类别根节点', '手术和操作类别根节点', 1, 407, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (121, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '实验室检查类别根节点', '实验室检查类别根节点', 1, 408, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (122, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查类别根节点', '辅助检查类别根节点', 1, 409, '页面显示词性');
-INSERT INTO `kl_dictionary_info` VALUES (123, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '年龄', '年龄', 1, 410, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (21, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '诊断', '1', 2, 1, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (22, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '药品', '2', 2, 2, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (23, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验套餐', '3', 2, 3, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (24, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检验细项', '4', 2, 4, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (25, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查', '5', 2, 5, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (26, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '检查子项', '6', 2, 6, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (27, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '手术和操作', '7', 2, 7, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (80, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '诊断', '疾病', 2, 100, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (81, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品', '药品通用名', 2, 101, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (82, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品剂型', '药品剂型', 2, 102, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (83, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状', '症状', 2, 103, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (84, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '体格检查项目', '体格检查项目', 2, 104, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (85, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '体格检查结果', '体格检查结果', 2, 105, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (86, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作', '手术和操作', 2, 106, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (87, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检验套餐', '实验室检查套餐', 2, 107, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (88, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检验细项', '实验室检查子项目', 2, 108, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (89, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检查', '辅助检查项目', 2, 109, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (90, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '检查子项', '辅助检查子项目', 2, 110, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (91, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查描述', '辅助检查描述', 2, 111, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (92, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查结果', '辅助检查结果', 2, 112, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (93, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '输血类型', '输血类型', 2, 113, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (94, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '麻醉', '麻醉', 2, 114, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (95, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '科室', '科室', 2, 115, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (96, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '性别', '性别', 2, 116, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (97, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '人群', '人群', 2, 117, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (98, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '食物', '食物', 2, 118, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (99, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '其他过敏原', '其他过敏原', 2, 119, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (100, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '医疗器械及物品', '医疗器械及物品', 2, 120, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (101, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '给药途径', '给药途径', 2, 121, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (102, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '部位', '部位', 2, 122, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (103, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '护理', '护理', 2, 123, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (104, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '量表/医学计算公式', '量表', 2, 124, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (105, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '单位', '单位', 2, 125, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (106, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, 'ICD10疾病类别', 'ICD10疾病类别', 2, 300, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (107, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品化学物质类别', '药品化学物质类别', 2, 301, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (108, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品治疗学类别', '药品治疗学类别', 2, 302, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (109, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品药理学类别', '药品药理学类别', 2, 303, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (110, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品解剖学类别', '药品解剖学类别', 2, 304, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (111, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状类别', '症状类别', 2, 305, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (112, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作类别', '手术和操作类别', 2, 306, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (113, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, 'ICD10疾病类别根节点', 'ICD10疾病类别根节点', 2, 400, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (114, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '科室疾病类别根节点', '科室疾病类别根节点', 2, 401, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (115, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品化学物质类别根节点', '药品化学物质类别根节点', 2, 402, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (116, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品治疗学类别根节点', '药品治疗学类别根节点', 2, 403, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (117, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品药理学类别根节点', '药品药理学类别根节点', 2, 404, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (118, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '药品解剖学类别根节点', '药品解剖学类别根节点', 2, 405, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (119, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '症状类别根节点', '症状类别根节点', 2, 406, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (120, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '手术和操作类别根节点', '手术和操作类别根节点', 2, 407, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (121, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '实验室检查类别根节点', '实验室检查类别根节点', 2, 408, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (122, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '辅助检查类别根节点', '辅助检查类别根节点', 2, 409, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (123, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '年龄', '年龄', 2, 410, '页面显示词性');
 INSERT INTO `kl_dictionary_info` VALUES (124, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, '危急值-实验室检查子项目', '3-108-2', 1, 0, '化验规则维护特殊处理-子规则首尾固定');
 INSERT INTO `kl_dictionary_info` VALUES (125, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, '其他值提醒-实验室检查子项目', '4-108-2', 1, 0, '化验规则维护特殊处理-子规则首尾固定');
 INSERT INTO `kl_dictionary_info` VALUES (126, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, '其他值提醒输血-实验室检查子项目', '5-108-2', 1, 0, '化验规则维护特殊处理-子规则首尾固定');
@@ -102,7 +109,7 @@ INSERT INTO `kl_dictionary_info` VALUES (138, 'N', '1970-01-01 12:00:00', '1970-
 INSERT INTO `kl_dictionary_info` VALUES (139, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 23, '复杂情况下高风险手术-手术和操作', '2-106', 1, 0, '高危手术存在（无子条件特殊处理）');
 INSERT INTO `kl_dictionary_info` VALUES (140, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 24, '诊断依据存在比较-年龄-体格检查项目', '410,104', 1, 0, '诊断依据存在比较只有数字没有文本');
 INSERT INTO `kl_dictionary_info` VALUES (141, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 25, '诊断依据存在比较-实验室检查子项目', '108', 1, 0, '诊断依据存在比较只有文本');
-INSERT INTO `kl_dictionary_info` VALUES (145, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '政策法规', '政策法规', 1, 411, '页面显示词性');
+INSERT INTO `kl_dictionary_info` VALUES (145, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 13, '政策法规', '政策法规', 2, 411, '页面显示词性');
 INSERT INTO `kl_dictionary_info` VALUES (146, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 50, '静态知识', '1', 1, 10, '静态知识类型');
 INSERT INTO `kl_dictionary_info` VALUES (147, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 50, '注意事项', '2', 1, 20, '静态知识类型');
 INSERT INTO `kl_dictionary_info` VALUES (148, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 50, '临床路径', '3', 1, 30, '静态知识类型');
@@ -322,6 +329,9 @@ INSERT INTO `kl_dictionary_info` VALUES (374, 'Y', '1970-01-01 12:00:00', '1970-
 INSERT INTO `kl_dictionary_info` VALUES (375, 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -102, '规则查询_术语类型', 'kl_plan代码生成', 1, 0, '规则查询_术语类型');
 INSERT INTO `kl_dictionary_info` VALUES (376, 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -103, '规则查询_基础规则类型', 'kl_plan代码生成', 1, 0, '规则查询_基础规则类型');
 INSERT INTO `kl_dictionary_info` VALUES (377, 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', -104, '规则查询_基础规则术语类型', 'kl_plan代码生成', 1, 0, '规则查询_基础规则术语类型');
+INSERT INTO `kl_dictionary_info` VALUES (384, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '量表/医学计算公式', '8', 2, 8, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (385, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '护理', '9', 2, 9, '静态知识类型');
+INSERT INTO `kl_dictionary_info` VALUES (386, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 10, '政策法规', '10', 2, 10, '静态知识类型');
 
 SET FOREIGN_KEY_CHECKS = 1;
 

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

@@ -365,7 +365,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
 
         List<Integer> types = staticKnowledgeIndexPageVO.getTypes();
 
-        List<DictionaryInfoDTO> dicType = dictionaryFacade.getListByGroupType(10);
+        List<DictionaryInfoDTO> dicType = klDictionaryInfoFacade.getListByGroupType(10);
         Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
         List<DictionaryInfoDTO> dicTypeName = klDictionaryInfoFacade.getListByGroupType(13);
 

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

@@ -242,9 +242,12 @@ public class MedRetrievalFacade {
 
         List<Integer> types = staticKnowledgeIndexVO.getTypes();
 
-        List<DictionaryInfoDTO> dicType = dictionaryFacade.getListByGroupType(10);
+        List<DictionaryInfoDTO> dicType = klDictionaryInfoFacade.getListByGroupType(10);
         Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
         List<DictionaryInfoDTO> dicTypeName = klDictionaryInfoFacade.getListByGroupType(13);
+
+        List<DictionaryInfoDTO> dicType_back = dictionaryFacade.getListByGroupType(10);
+        Map<String, String> dicTypeMap_back = EntityUtil.makeMapWithKeyValue(dicType_back, "name", "val");
         List<DictionaryInfoDTO> dicTypeName_back = dictionaryFacade.getListByGroupType(13);
 
         //检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
@@ -292,13 +295,17 @@ public class MedRetrievalFacade {
         List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);
 
         retList.forEach(i -> {
+            //前端展示
             if (staticKnowledgeIndexVO.getHasInfo().equals(1)) {
                 i.setTypeName(convertTypeName(i.getTypeName(), 2, dicTypeName));
+                if (dicTypeMap.containsKey(i.getTypeName())) {
+                    i.setType(Integer.valueOf(dicTypeMap.get(i.getTypeName())));
+                }
             } else {
                 i.setTypeName(convertTypeName(i.getTypeName(), 2, dicTypeName_back));
-            }
-            if (dicTypeMap.containsKey(i.getTypeName())) {
-                i.setType(Integer.valueOf(dicTypeMap.get(i.getTypeName())));
+                if (dicTypeMap_back.containsKey(i.getTypeName())) {
+                    i.setType(Integer.valueOf(dicTypeMap_back.get(i.getTypeName())));
+                }
             }
         });
         return retList;

src/main/resources/mapper/KlConceptMapper.xml

@@ -286,7 +286,7 @@
         s.typeName,
         s.code,
         s.guocode,
-        IF(( s.CODE IS NULL OR s.CODE = '' ) AND s.NAME = s.guoname, '', s.guoname ) AS guoname,
+        s.guoname,
         IF( s2.concept_id IS NOT NULL, s2.concept_id, s3.concept_id ) AS conceptId,
         s1.clinical_pathway_name,
         s1.notice_name,
@@ -441,7 +441,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -474,7 +476,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -507,7 +511,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -543,7 +549,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -576,7 +584,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -609,7 +619,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,

src/main/resources/mapper/KlConceptStaticMapper.xml

@@ -78,7 +78,7 @@
         s.typeName,
         s.code,
         s.guocode,
-        IF(( s.CODE IS NULL OR s.CODE = '' ) AND s.NAME = s.guoname, '', s.guoname ) AS guoname,
+        s.guoname,
         s1.concept_id AS conceptId,
         s1.clinical_pathway_name AS clinicalPathwayName,
         s1.notice_name AS noticeName,
@@ -226,7 +226,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -260,7 +262,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -294,7 +298,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -330,7 +336,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -364,7 +372,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,
@@ -398,7 +408,9 @@
             1 AS isConcept,
             e.lib_type AS type,
             c.name AS typeName,
-            NULL AS code
+            NULL AS code,
+            NULL AS guocode,
+            NULL AS guoname
             FROM
             kl_library_info a,
             kl_concept b,