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

# Conflicts:
#	docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -254,11 +254,14 @@ INSERT INTO `icss_index_config` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-0
 INSERT INTO `icss_index_config` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '糖化血红蛋白', '21773', '2', '1', null);
 INSERT INTO `icss_index_config` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '血压', '105', '1', '1', null);
 
+-- 王宇
 --模板信息字段修改
 alter table icss_module_info change  column disease module_type bigint(20) COMMENT '(0.通用 1.根据科室划分 2.慢病)';
 alter table icss_module_info add  column relation_id bigint(20) NOT NULL DEFAULT '0' COMMENT '关联id';
 ALTER TABLE `icss_module_info` MODIFY COLUMN `type`  int(11) NOT NULL DEFAULT 0 COMMENT '类型(1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱 22.现病史空模板 32.现病史子模板)' AFTER `name`;
 
+-- 赵佩诗
+
 -- ----------------------------
 -- Records of icss_lis_mapping
 -- ----------------------------