Prechádzať zdrojové kódy

Merge branch 'dev/20200616_1.3.5' into debug

gaodm 5 rokov pred
rodič
commit
0130341102

+ 2 - 0
doc/010.20200617v1.3.5/qc_initv1.3.5.sql

@@ -1,4 +1,6 @@
 use `qc`;
+-- 技术服务部已执行
+-- ALTER TABLE `qc`.`bas_doctor_info` ADD COLUMN `group_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小组id' AFTER `occup`;
 
 -- UPDATE `sys_permission` SET is_deleted = 'Y' WHERE permissionUrl LIKE '/console%' AND is_deleted='N';
 

+ 3 - 3
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2353,7 +2353,7 @@
         t1.score,
         t2.avgScore,
         t1.msg,
-        t1.casesName
+        t1.caseName
         FROM
         (
         SELECT
@@ -2367,7 +2367,7 @@
         a.leave_hospital_date AS leaveHospitalDate,
         b.score_res AS score,
         c.msg AS msg,
-        d.NAME AS casesName,
+        d.NAME AS caseName,
         a.beh_dept_id AS behDeptId,
         a.beh_dept_name AS behDeptName
         FROM
@@ -2491,7 +2491,7 @@
         t1.behDeptName,
         t1.patName,
         t1.behospitalCode,
-        t1.casesName
+        t1.caseName
     </select>
 
     <!-- 条目缺陷质控评分页(内页)-->