条目缺陷占比调整

src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -153,26 +153,12 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
     public IPage<DeptEntryNumDTO> entryCountGroupByEntryAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
-     * 条目缺陷占比基础数据（内页）
+     * 条目缺陷占比（内页）
      *
      * @return
      */
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
-    /**
-     * 条目缺陷总数（内页）
-     *
-     * @return
-     */
-    public Integer entryGroupByEntrySum(@Param("hospitalId") String hospitalId,@Param("isPlacefile") String isPlacefile,@Param("startDate") String startDate,@Param("endDate") String endDate);
-
-    /**
-     * 条目缺陷分值统计（内页）
-     *
-     * @return
-     */
-    public List<EntryNumDTO> entryGroupByEntryScore(@Param("hospitalId") String hospitalId,@Param("isPlacefile") String isPlacefile, @Param("ids")Set<Long> ids);
-
     /**
      * 条目缺陷占比-科室（内页）
      *

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

@@ -209,27 +209,7 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
      */
     @Override
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO) {
-       //基础数据
         IPage<EntryNumDTO> entryNumDTOIPage  = baseMapper.entryGroupByEntryInnerPage(filterPageVO);
-        //缺陷总数
-          Integer sumInteget = baseMapper.entryGroupByEntrySum(filterPageVO.getHospitalId(),filterPageVO.getIsPlacefile(),
-                                                                filterPageVO.getStartDate(),filterPageVO.getEndDate());
-        float nsum = 0;
-        List<EntryNumDTO> records = entryNumDTOIPage.getRecords();
-        if(CollectionUtils.isEmpty(records)){
-            return null;
-        }
-        for (EntryNumDTO record : records) {
-            int num = record.getNum().intValue();
-            if(sumInteget!=null && sumInteget!=0 ){
-                int sum = sumInteget.intValue();
-                 nsum =(float) num/sum;
-            }
-            DecimalFormat df = new DecimalFormat("0.00");
-            String percent = df.format(nsum*100);
-            record.setPercentStr(percent+"%");
-            record.setTotleNum(sumInteget);
-        }
         return entryNumDTOIPage;
     }
 

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -430,122 +430,6 @@
 
     <!-- 条目缺陷占比（内页） -->
     <select id="entryGroupByEntryInnerPage" resultType="com.diagbot.dto.EntryNumDTO">
-    SELECT
-    tt2.id as id,
-    tt2.name as name,
-    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
-    (
-    SELECT
-    a.hospital_id,
-    d.cases_entry_id,
-    d.cases_id,
-    count(*) as num,
-    d.is_reject
-    FROM
-        med_behospital_info a,
-        med_qcresult_detail d
-        WHERE
-        a.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND a.hospital_id = d.hospital_id
-        AND a.behospital_code = d.behospital_code
-    <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
-        AND a.is_placefile = #{filterPageVO.isPlacefile}
-    </if>
-    AND a.qc_type_id != 0
-        <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
-            AND a.hospital_id = #{filterPageVO.hospitalId}
-        </if>
-    <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-        <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
-            <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
-        </if>
-        <if test="filterPageVO.endDate != null and filterPageVO.endDate != ''">
-            <![CDATA[ AND a.behospital_date <= #{filterPageVO.endDate}]]>
-        </if>
-    </if>
-    <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 1">
-        <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
-            <![CDATA[ AND a.leave_hospital_date >= #{filterPageVO.startDate}]]>
-        </if>
-        <if test="filterPageVO.endDate != null and filterPageVO.endDate != ''">
-            <![CDATA[ AND a.leave_hospital_date <= #{filterPageVO.endDate}]]>
-        </if>
-    </if>
-    <if test="filterPageVO.isReject != null">
-        AND d.is_reject = #{filterPageVO.isReject}
-    </if>
-    GROUP BY
-    d.cases_entry_id,
-    d.is_reject,
-    d.cases_id
-    ) tt1,
-    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>
-    <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-        AND tt2.cases_name = #{filterPageVO.casesName}
-    </if>
-
-        </select>
-    <!-- 条目缺陷占比缺陷总量（内页） -->
-    <select id="entryGroupByEntrySum" resultType="java.lang.Integer">
-        SELECT
-        count(*) AS mrNum
-        FROM
-        med_behospital_info a,
-        med_qcresult_info c
-        WHERE
-        a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.behospital_code = c.behospital_code
-        <if test="isPlacefile != null and isPlacefile != ''">
-            and a.is_placefile = #{isPlacefile}
-        </if>
-        AND a.qc_type_id != 0
-        <if test="hospitalId != null and hospitalId != ''">
-            AND a.hospital_id = #{hospitalId}
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 0">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.behospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.behospital_date <= #{endDate}]]>
-            </if>
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 1">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.leave_hospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
-            </if>
-        </if>
-    </select>
-
-    <!-- 条目缺陷占比原始数据统计（内页） -->
-   <!-- <select id="entryGroupByEntryInnerPage" resultType="com.diagbot.dto.EntryNumDTO">
         SELECT
         t.*
         FROM
@@ -586,15 +470,11 @@
         d.is_reject
         FROM
         med_behospital_info a,
-        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="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile != ''">
             and a.is_placefile = #{filterPageVO.isPlacefile}
@@ -679,7 +559,7 @@
         </if>
         ) t2
         ) t
-    </select>-->
+    </select>
     <!-- 单项否决缺陷占比（首页） -->
     <select id="entryRejectPercent" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.EntryNumDTO">
         SELECT