Parcourir la source

控制台页面各科室病历等级占比、单项否决占比、条目缺陷占比接口bug修改

xiewei il y a 6 mois
Parent
commit
c2987dab88

+ 7 - 5
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1352,11 +1352,13 @@ public class ConsoleFacade {
         Integer limitCount = filterVO.getLimitCount();
         List<DeptNumDTO> numDTOList = qcresultInfoFacade.qcResultLevelPercent(filterVO);
         if (ListUtil.isNotEmpty(numDTOList)) {
-            if (numDTOList.size() <= limitCount) {
-                retList = numDTOList;
-            } else {
-                retList = numDTOList.subList(0, limitCount);
-            }
+//            if (numDTOList.size() <= limitCount) {
+//                retList = numDTOList;
+//            } else {
+//                retList = numDTOList.subList(0, limitCount);
+//            }
+            //展示全部科室,不再只是前10条
+            retList = numDTOList;
         }
         return retList;
     }

+ 11 - 2
src/main/resources/mapper/QcresultInfoMapper.xml

@@ -394,12 +394,16 @@
         count(*) AS mrNum
         FROM
         med_behospital_info a,
-        med_qcresult_info c
+        med_qcresult_info c,
+        med_qcresult_detail d
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
+        AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
+        AND a.behospital_code = d.behospital_code
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -783,15 +787,20 @@
         count(*) AS mrNum
         FROM
         med_behospital_info a,
-        med_qcresult_info c
+        med_qcresult_info c,
+        med_qcresult_detail d
         WHERE
         a.is_deleted = 'N'
         AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
         AND a.hospital_id = c.hospital_id
+        AND a.hospital_id = d.hospital_id
         AND a.behospital_code = c.behospital_code
+        AND a.behospital_code = d.behospital_code
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
+        AND d.is_reject = 1
         AND a.qc_type_id != 0
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}