Merge remote-tracking branch 'origin/dev/20200522temp' into debug

doc/005.20200528v1.2.x/qc_init.sql

@@ -1003,3 +1003,14 @@ INSERT INTO `bas_dept_info` VALUES ('X0001', 3, NULL, '党委办公室', NULL, '
 INSERT INTO `bas_dept_info` VALUES ('X0002', 3, NULL, '院领导', NULL, 'YLD', '院办', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0');
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+update med_record_analyze
+set map_keys=concat(map_keys,',mode_id=',mode_id)
+where map_keys NOT like '%mode_id=%';
+
+update med_record_analyze
+set map_keys=concat(map_keys,',rec_title=',rec_type)
+where map_keys NOT like '%rec_title=%';
+
+insert into med_record_analyze(hospital_id,name,mode_id,mode_name,rec_type,map_type) VALUE(1,'长兴病案首页模板',6,'病案首页','病案首页','1');
+insert into med_record_module(hospital_id,rec_type_detail,with_record_analyze_names,mode_id,mode_name) VALUE(1,'长兴病案首页模板','长兴病案首页模板',6,'病案首页');

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -326,7 +326,7 @@
     <!-- 各科室缺陷占比 -->
     <select id="resultStatisticsByDept2"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
-        a.beh_dept_id,
+        a.beh_dept_id as id,
         a.beh_dept_name as name,
         count(*) AS num
         FROM