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

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

@@ -235,7 +235,8 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
         }
         //缺陷分值
         String isPlacefile = filterPageVO.getIsPlacefile();
-        List<EntryNumDTO> entryScore = baseMapper.entryGroupByEntryScore(hospitalId,isPlacefile, ids);
+        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())){

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4842,12 +4842,20 @@
             )
         </if>
         <if test="qcResultShortPageVO.leaveHosType != null and qcResultShortPageVO.leaveHosType ==1">
-            ,med_home_page t2
+            ,med_home_page t2,
+             med_medical_record b,
+            med_medical_record_content c
             WHERE
             t2.is_deleted = 'N'
+            and b.is_deleted = 'N'
+            and	c.is_deleted = 'N'
             AND t1.hospital_id = t2.hospital_id
             AND t1.behospital_code = t2.behospital_code
-            AND t2.return_to_type = '死亡'
+            and t1.hospital_id = b.hospital_id
+            and t1.hospital_id = c.hospital_id
+            AND t1.behospital_code = b.behospital_code
+            AND b.rec_id = c.rec_id
+            and b.mode_id = '24'
         </if>
         <if test="qcResultShortPageVO.leaveHosType != null and qcResultShortPageVO.leaveHosType ==4">
             ,med_home_page t2