条目缺陷占比/死亡人数调整

src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -211,18 +211,15 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO) {
        //基础数据
         IPage<EntryNumDTO> entryNumDTOIPage  = baseMapper.entryGroupByEntryInnerPage(filterPageVO);
-        String hospitalId = filterPageVO.getHospitalId();
         //缺陷总数
           Integer sumInteget = baseMapper.entryGroupByEntrySum(filterPageVO.getHospitalId(),filterPageVO.getIsPlacefile(),
                                                                 filterPageVO.getStartDate(),filterPageVO.getEndDate());
         float nsum = 0;
-          Set<Long> ids = new HashSet<Long>();
         List<EntryNumDTO> records = entryNumDTOIPage.getRecords();
         if(CollectionUtils.isEmpty(records)){
             return null;
         }
         for (EntryNumDTO record : records) {
-            ids.add(record.getId());
             int num = record.getNum().intValue();
             if(sumInteget!=null && sumInteget!=0 ){
                 int sum = sumInteget.intValue();
@@ -233,17 +230,6 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
             record.setPercentStr(percent+"%");
             record.setTotleNum(sumInteget);
         }
-        //缺陷分值
-        String isPlacefile = filterPageVO.getIsPlacefile();
-        List<EntryNumDTO> entryScore = new ArrayList<>();
-        entryScore = baseMapper.entryGroupByEntryScore(hospitalId,isPlacefile, ids);
-        for (EntryNumDTO record : records) {
-            for (EntryNumDTO entryNumDTO : entryScore) {
-                if(record.getId().equals(entryNumDTO.getId())){
-                 record.setScore(entryNumDTO.getScore());
-                    }
-                }
-            }
         return entryNumDTOIPage;
     }
 

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -436,6 +436,12 @@
     tt2.cases_id as casesId,
     tt2.cases_name as casesName,
     tt1.num as num,
+    <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
+        tt3.score_run as score,
+    </if>
+    <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 1">
+        tt3.score,
+    </if>
     tt1.is_reject as isReject
     FROM
     (
@@ -484,11 +490,15 @@
     d.is_reject,
     d.cases_id
     ) tt1,
-    qc_cases_entry tt2
+    qc_cases_entry tt2,
+    qc_cases_entry_hospital tt3
     WHERE
     tt2.is_deleted = 'N'
+    AND tt3.is_deleted = 'N'
+    AND tt1.hospital_id = tt3.hospital_id
     AND tt1.cases_id = tt2.cases_id
     AND tt1.cases_entry_id = tt2.id
+    AND tt1.cases_entry_id = tt3.cases_entry_id
     <if test="filterPageVO.name != null and filterPageVO.name != ''">
         AND tt2.name like CONCAT('%', #{filterPageVO.name},'%')
     </if>
@@ -534,30 +544,8 @@
         </if>
     </select>
 
-    <!-- 条目缺陷占比分值统计 -->
-    <select id="entryGroupByEntryScore"  resultType="com.diagbot.dto.EntryNumDTO">
-    SELECT
-        a.hospital_id as hospitalId,
-
-        <if test="isPlacefile != null and isPlacefile == 0">
-            a.score_run as score,
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 1">
-            a.score,
-        </if>
-        a.cases_entry_id as id
-    FROM
-        qc_cases_entry_hospital a
-    WHERE
-        a.is_deleted = 'N'
-        AND a.hospital_id = #{hospitalId}
-        AND a.cases_entry_id IN
-        <foreach collection="ids" open="(" separator="," close=")" item="item">
-            ${item}
-        </foreach>
-    </select>
     <!-- 条目缺陷占比原始数据统计（内页） -->
-  <!--  <select id="entryGroupByEntryInnerPage" resultType="com.diagbot.dto.EntryNumDTO">
+   <!-- <select id="entryGroupByEntryInnerPage" resultType="com.diagbot.dto.EntryNumDTO">
         SELECT
         t.*
         FROM