稽查数据质控为0也展示出来

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1302,30 +1302,7 @@ public class ConsoleFacade {
 
     public List<MedicalCheckExportDTO> medicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO) {
         filterFacade.getMedicalCheckVOSet(filterVO);
-        //colums
-        QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
-        hospitalSetQueryWrapper.eq("is_deleted", 'N')
-                .eq("hospital_id", filterVO.getHospitalId())
-                .eq("code", "medical_check_form");
-        SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
-
-        //表头生成
-        List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
-
-        //目标条目
-        List<Long> casesEntryIds = Lists.newArrayList();
-        //遍历第一个条目
-        for (String valueStr : columnSet) {
-            if (StringUtil.isBlank(valueStr)) {
-                continue;
-            }
-            String[] keyValue = valueStr.split("--");
-            if (keyValue != null || keyValue.length > 1) {
-                casesEntryIds.add(Long.valueOf(keyValue[0]));
-            }
-        }
-
-        List<MedicalCheckExportDTO> medicalCheck = behospitalInfoFacade.getMedicalCheckExport(filterVO, casesEntryIds);
+        List<MedicalCheckExportDTO> medicalCheck = behospitalInfoFacade.getMedicalCheckExport(filterVO);
         return medicalCheck;
     }
 
@@ -1338,30 +1315,7 @@ public class ConsoleFacade {
      */
     public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO) {
         filterFacade.getMedicalCheckVOSet(filterVO);
-        //colums
-        QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
-        hospitalSetQueryWrapper.eq("is_deleted", 'N')
-                .eq("hospital_id", filterVO.getHospitalId())
-                .eq("code", "medical_check_form");
-        SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
-
-        //表头生成
-        List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
-
-        //目标条目
-        List<Long> casesEntryIds = Lists.newArrayList();
-        //遍历第一个条目
-        for (String valueStr : columnSet) {
-            if (StringUtil.isBlank(valueStr)) {
-                continue;
-            }
-            String[] keyValue = valueStr.split("--");
-            if (keyValue != null || keyValue.length > 1) {
-                casesEntryIds.add(Long.valueOf(keyValue[0]));
-            }
-        }
-
-        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalCheck(filterVO, casesEntryIds);
+        IPage<MedicalCheckDTO> medicalCheck = behospitalInfoFacade.getMedicalCheck(filterVO);
         return medicalCheck;
     }
 

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

@@ -330,7 +330,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public IPage<MedicalCheckDTO>  getMedicalCheck(@Param("filterVO")FilterMedicalCheckVO filterVO, @Param("infos")List<Long> infos);
+    public IPage<MedicalCheckDTO>  getMedicalCheck(@Param("filterVO")FilterMedicalCheckVO filterVO);
 
     /**
      * 病历稽查表导出
@@ -338,7 +338,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<MedicalCheckExportDTO>  getMedicalCheckExport(@Param("filterVO")FilterMedicalCheckVO filterVO, @Param("infos")List<Long> infos);
+    public List<MedicalCheckExportDTO>  getMedicalCheckExport(@Param("filterVO")FilterMedicalCheckVO filterVO);
 
 
     /**

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -313,13 +313,13 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * 病历稽查表
      * @return
      */
-    IPage<MedicalCheckDTO>  getMedicalCheck(FilterMedicalCheckVO filterVO,List<Long>casesEntryIds);
+    IPage<MedicalCheckDTO>  getMedicalCheck(FilterMedicalCheckVO filterVO);
 
     /**
      * 病历稽查表导出
      * @return
      */
-    List<MedicalCheckExportDTO>  getMedicalCheckExport(FilterMedicalCheckVO filterVO,List<Long>casesEntryIds);
+    List<MedicalCheckExportDTO>  getMedicalCheckExport(FilterMedicalCheckVO filterVO);
 
 
     /**

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

@@ -463,8 +463,8 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO,@Param("casesEntryIds") List<Long>casesEntryIds) {
-        return baseMapper.getMedicalCheck(filterVO,casesEntryIds);
+    public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO) {
+        return baseMapper.getMedicalCheck(filterVO);
 
     }
 
@@ -475,8 +475,8 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public List<MedicalCheckExportDTO> getMedicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO,@Param("casesEntryIds") List<Long>casesEntryIds) {
-        List<MedicalCheckExportDTO> medicalCheckExport = baseMapper.getMedicalCheckExport(filterVO, casesEntryIds);
+    public List<MedicalCheckExportDTO> getMedicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO) {
+        List<MedicalCheckExportDTO> medicalCheckExport = baseMapper.getMedicalCheckExport(filterVO);
         return medicalCheckExport;
 
     }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6422,26 +6422,26 @@
                 <result column="deptName" property="deptName"/>
                 <result column="deptId" property="deptId"/>
                 <result column="doctorName" property="doctorName"/>
-                <result column="ryjlw_24" property="ryjlw_24"/>
-                <result column="scbcjlw_8h" property="scbcjlw_8h"/>
-                <result column="zrsccfw_72h" property="zrsccfw_72h"/>
-                <result column="ryhljbcw_3d" property="ryhljbcw_3d"/>
-                <result column="zrcfw_2w" property="zrcfw_2w"/>
-                <result column="zzcfw_3w" property="zzcfw_3w"/>
-                <result column="qjjlw_6h" property="qjjlw_6h"/>
-                <result column="hzjlw_24h" property="hzjlw_24h"/>
-                <result column="sqtlxjw" property="sqtlxjw"/>
-                <result column="sxjlsw_24h" property="sxjlsw_24h"/>
-                <result column="xhscw_30m" property="xhscw_30m"/>
-                <result column="shzdcfw_24h" property="shzdcfw_24h"/>
-                <result column="shjbcw_3d" property="shjbcw_3d"/>
-                <result column="zkjbcw_3d" property="zkjbcw_3d"/>
-                <result column="zkjlw_24" property="zkjlw_24"/>
-                <result column="bwzhjlbcw_md" property="bwzhjlbcw_md"/>
+                <result column="RYJLW_24" property="ryjlw_24"/>
+                <result column="SCBCJLW_8H" property="scbcjlw_8h"/>
+                <result column="ZRSCCFW_72H" property="zrsccfw_72h"/>
+                <result column="RYHLJBCW_3D" property="ryhljbcw_3d"/>
+                <result column="ZRCFW_2W" property="zrcfw_2w"/>
+                <result column="ZZCFW_3W" property="zzcfw_3w"/>
+                <result column="QJJLW_6H" property="qjjlw_6h"/>
+                <result column="HZJLW_24H" property="hzjlw_24h"/>
+                <result column="SQTLXJW" property="sqtlxjw"/>
+                <result column="SXJLSW_24H" property="sxjlsw_24h"/>
+                <result column="XHSCW_30M" property="xhscw_30m"/>
+                <result column="SHZDCFW_24H" property="shzdcfw_24h"/>
+                <result column="SHJBCW_3D" property="shjbcw_3d"/>
+                <result column="ZKJBCW_3D" property="zkjbcw_3d"/>
+                <result column="ZKJLW_24" property="zkjlw_24"/>
+                <result column="BWZHJLBCW_MD" property="bwzhjlbcw_md"/>
                 <result column="SXHWJL" property="sxhwjl"/>
                 <result column="SXPJW_24" property="sxpjw_24"/>
-                <result column="sxhwjl" property="wjzwjl"/>
-                <result column="wywwcxj" property="wywwcxj"/>
+                <result column="WJZWJL" property="wjzwjl"/>
+                <result column="WYWWCXJ" property="wywwcxj"/>
     </resultMap>
 
     <!--    病历稽查表最新sql-->
@@ -6450,26 +6450,26 @@
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
         a.doctor_name as doctorName,
-        sum(c.cases_entry_id = 2658) as ryjlw_24,
-        sum(c.cases_entry_id = 2686) as scbcjlw_8h,
-        sum(c.cases_entry_id = 2657) as zrsccfw_72h,
-        sum(c.cases_entry_id = 3010) as ryhljbcw_3d,
-        sum(c.cases_entry_id = 2655) as zrcfw_2w,
-        sum(c.cases_entry_id = 2654) as zzcfw_3w,
-        sum(c.cases_entry_id = 2852) as qjjlw_6h,
-        sum(c.cases_entry_id = 2287) as hzjlw_24h,
-        sum(c.cases_entry_id = 3025) as sqtlxjw,
-        sum(c.cases_entry_id = 2170) as sxjlsw_24h,
-        sum(c.cases_entry_id = 2930) as xhscw_30m,
-        sum(c.cases_entry_id = 2900) as shzdcfw_24h,
-        sum(c.cases_entry_id = 2229) as shjbcw_3d,
-        sum(c.cases_entry_id = 2217) as zkjbcw_3d,
-        sum(c.cases_entry_id = 2218) as zkjlw_24,
-        sum(c.cases_entry_id = 2220) as bwzhjlbcw_md,
-        sum(c.cases_entry_id = 2486) as sxhwjl,
-        sum(c.cases_entry_id = 3063) as sxpjw_24,
-        sum(c.cases_entry_id = 3062) as wjzwjl,
-        sum(c.cases_entry_id = 2495) as wywwcxj
+        sum(c.cases_entry_id = 2658) as RYJLW_24,
+        sum(c.cases_entry_id = 2686) as SCBCJLW_8H,
+        sum(c.cases_entry_id = 2657) as ZRSCCFW_72H,
+        sum(c.cases_entry_id = 3010) as RYHLJBCW_3D,
+        sum(c.cases_entry_id = 2655) as ZRCFW_2W,
+        sum(c.cases_entry_id = 2654) as ZZCFW_3W,
+        sum(c.cases_entry_id = 2852) as QJJLW_6H,
+        sum(c.cases_entry_id = 2287) as HZJLW_24H,
+        sum(c.cases_entry_id = 3025) as SQTLXJW,
+        sum(c.cases_entry_id = 2170) as SXJLSW_24H,
+        sum(c.cases_entry_id = 2930) as XHSCW_30M,
+        sum(c.cases_entry_id = 2900) as SHZDCFW_24H,
+        sum(c.cases_entry_id = 2229) as SHJBCW_3D,
+        sum(c.cases_entry_id = 2217) as ZKJBCW_3D,
+        sum(c.cases_entry_id = 2218) as ZKJLW_24,
+        sum(c.cases_entry_id = 2220) as BWZHJLBCW_MD,
+        sum(c.cases_entry_id = 2486) as SXHWJL,
+        sum(c.cases_entry_id = 3063) as SXPJW_24,
+        sum(c.cases_entry_id = 3062) as WJZWJL,
+        sum(c.cases_entry_id = 2495) as WYWWCXJ
         FROM
         med_behospital_info a,
         med_qcresult_info b,
@@ -6492,15 +6492,6 @@
         and e.group_id is not NULL
         AND LENGTH(e.group_id)>0
         AND a.qc_type_id != 0
-        AND d.id in
-        <if test="infos != null and infos.size() > 0">
-            <foreach collection="infos" open="(" separator="," close=")" item="item">
-                ${item}
-            </foreach>
-        </if>
-        <if test="infos = null || infos.size() == 0">
-            and b.info in('000000ASDQWEZXC@#$%')
-        </if>
         <if test="filterVO.isPlacefile != null and filterVO.isPlacefile != ''">
             and a.is_placefile = #{filterVO.isPlacefile}
         </if>
@@ -6608,15 +6599,6 @@
         and e.group_id is not NULL
         AND LENGTH(e.group_id)>0
         AND a.qc_type_id != 0
-        AND d.id in
-        <if test="infos != null and infos.size() > 0">
-            <foreach collection="infos" open="(" separator="," close=")" item="item">
-                ${item}
-            </foreach>
-        </if>
-        <if test="infos = null || infos.size() == 0">
-            and b.info in('000000ASDQWEZXC@#$%')
-        </if>
         <if test="filterVO.isPlacefile != null and filterVO.isPlacefile != ''">
             and a.is_placefile = #{filterVO.isPlacefile}
         </if>