Merge remote-tracking branch 'origin/dev/20200702_1.3.7' into dev/20200702_1.3.7

doc/013.20200706v1.3.7/qc_initv1.3.7.sql

@@ -123,11 +123,6 @@ INSERT INTO `sys_menu` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:
 INSERT INTO `sys_menu` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '出院人数统计', '17', 'YH-ZKK-CYRSTJ', '1', '1', '11', '用户-质控科-出院人数统计');
 INSERT INTO `sys_menu` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '质控核查统计', '17', 'YH-ZKK-ZKHCTJ', '1', '1', '12', '用户-质控科-质控核查统计');
 
-
-
 -- ----------------------------
 -- Table structure for sys_menu_permission
 -- ----------------------------

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -42,7 +42,7 @@
     <select id="getPage" resultType="com.diagbot.dto.BehospitalInfoDTO">
         SELECT * FROM (
         select   t.*,
-        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus
+        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status
          from (
         select a.*, ifnull(b.level,'未评分') as `level`, b.grade_type, b.score_res, b.gmt_create as
         grade_time, c.age from med_behospital_info a
@@ -102,7 +102,7 @@
         and t.is_placefile = 1) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
-        and p.checkStatus = #{checkStatus}
+        and p.check_status = #{checkStatus}
         </if>
     </select>
 
@@ -261,7 +261,7 @@
         SELECT * from (
         SELECT
         t.*,
-        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus
+        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status
         FROM
         ( SELECT
         a.*,
@@ -335,7 +335,7 @@
         and t.is_placefile = 1) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
-            and p.checkStatus = #{checkStatus}
+            and p.check_status = #{checkStatus}
         </if>
     </select>
 
@@ -343,7 +343,7 @@
     <select id="getPageByPerson" resultType="com.diagbot.dto.BehospitalInfoDTO">
         Select * from (
         select t.*,
-        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus
+        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status
          from (SELECT
         a.*,
         IFNULL(b.level, '未评分') AS `level`,
@@ -416,7 +416,7 @@
         and t.is_placefile = 1) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
-            and p.checkStatus = #{checkStatus}
+            and p.check_status = #{checkStatus}
         </if>
     </select>
 
@@ -424,7 +424,7 @@
     <select id="getPageByGroup" resultType="com.diagbot.dto.BehospitalInfoDTO">
         select * from (
         select t.*,
-        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus
+        CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status
          from (
         select a.*, ifnull(b.level,'未评分') as `level`, b.grade_type, b.score_res, b.gmt_create as
         grade_time, c.age from med_behospital_info a
@@ -496,7 +496,7 @@
         and t.is_placefile = 1) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
-            and p.checkStatus = #{checkStatus}
+            and p.check_status = #{checkStatus}
         </if>
     </select>
 
@@ -2264,7 +2264,7 @@
     <!-- 质控评分导出到excel-->
     <select id="exportQcresult" resultMap="ExportExcelMap" parameterType="com.diagbot.vo.ExportQcresultVO">
         SELECT * FROM (
-        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus FROM (
+        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status FROM (
         SELECT
         t1.behDeptId,
         t1.behDeptName,
@@ -2411,14 +2411,14 @@
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
         <if test="checkStatus != null ">
-            where tu.checkStatus = #{checkStatus}
+            where tu.check_status = #{checkStatus}
         </if>
     </select>
 
     <!-- 科室质控评分导出到excel-->
     <select  id="exportQcresultByDept" resultMap="ExportExcelMap" parameterType="com.diagbot.vo.ExportQcresultVO">
         SELECT * FROM (
-        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus FROM (
+        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status FROM (
         SELECT
         t1.behDeptId,
         t1.behDeptName,
@@ -2579,14 +2579,14 @@
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
         <if test="checkStatus != null ">
-            where tu.checkStatus = #{checkStatus}
+            where tu.check_status = #{checkStatus}
         </if>
     </select>
 
     <!-- 医疗组质控评分导出到excel-->
     <select  id="exportQcresultByGroup" resultMap="ExportExcelMap" parameterType="com.diagbot.vo.ExportQcresultVO">
         SELECT * FROM (
-        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END checkStatus FROM (
+        SELECT tp.*,CASE WHEN ISNULL(g.status) THEN 0 ELSE g.status END check_status FROM (
         SELECT
         t1.behDeptId,
         t1.behDeptName,
@@ -2753,7 +2753,7 @@
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id ) tu
         <if test="checkStatus != null ">
-            where tu.checkStatus = #{checkStatus}
+            where tu.check_status = #{checkStatus}
         </if>
     </select>