Merge branch 'dev/20201009_1.4.6' into debug

doc/023.20200923v5.4.0云后台自用/qc_initv5.4.0.sql

@@ -0,0 +1,5 @@
+use `qc`;
+ALTER TABLE `qc_module_info` ADD `default_module` int(3) DEFAULT NULL COMMENT '默认模版是否开启(0-否 1-是)' AFTER `name`;
+UPDATE  `qc_module_info` set default_module = 0
+ALTER TABLE `qc_type` ADD `default_module` int(3) DEFAULT NULL COMMENT '默认模版是否开启(0-否 1-是 -1病历不质控)' AFTER `name`;
+UPDATE  `qc_type` set default_module = 0

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6764,6 +6764,7 @@
         t1.LEVEL AS LEVEL,
         t1.grade_type AS gradeType,
         t1.score_res AS scoreRes,
+        t1.scoreBn,
         t1.NAME AS NAME,
         t1.sex AS sex,
         t1.beh_dept_id AS behDeptId,
@@ -6808,6 +6809,7 @@
         b.LEVEL,
         b.grade_type,
         b.score_res,
+        e.score_res as scoreBn,
         a.NAME,
         a.sex,
         a.beh_dept_id,
@@ -6839,6 +6841,7 @@
         AND a.behospital_code = e.behospital_code
         AND a.qc_type_id != 0
         AND e.`level`='不合格'
+        AND e.cases_id= 243
         <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
@@ -6865,10 +6868,11 @@
             AND a.beh_dept_name = #{qcResultPageVO.behDeptName}
         </if>
         <if test="qcResultPageVO.level != null and qcResultPageVO.level != ''">
+            AND b.`level` = #{qcResultPageVO.level}
+        </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
-        </if>
         <if test="qcResultPageVO.patName != null and qcResultPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultPageVO.patName}, '%' )
         </if>
@@ -7124,6 +7128,7 @@
         f1.behospitalDate,
         f1.leaveHospitalDate,
         f1.score,
+        f1.scoreBn,
         f2.avgScore,
         f1.msg,
         f1.caseName,
@@ -7142,6 +7147,7 @@
         t.leaveHospitalDate AS leaveHospitalDate,
         qi.score_res AS score,
         qd.msg AS msg,
+        t.scoreBn,
         qc.NAME AS caseName,
         t.behDeptId,
         t.behDeptName,
@@ -7160,6 +7166,7 @@
         t1.LEVEL AS LEVEL,
         t1.grade_type AS gradeType,
         t1.score_res AS scoreRes,
+        t1.scoreBn,
         t1.NAME AS NAME,
         t1.sex AS sex,
         t1.beh_dept_id AS behDeptId,
@@ -7204,6 +7211,7 @@
         b.LEVEL,
         b.grade_type,
         b.score_res,
+        c.score_res as scoreBn,
         a.NAME,
         a.sex,
         a.beh_dept_id,