稽查表全院/科室

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

@@ -78,18 +78,22 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                 QueryWrapper.groupBy("doctor_name");
                 QueryWrapper.orderByAsc("doctor_name");
                 list = behospitalInfoFacade.list(QueryWrapper);
+                if(ListUtil.isNotEmpty(list)){
+                    list.forEach(behospitalInfo -> {
+                                if(behospitalInfo!= null && StringUtils.isNotEmpty(behospitalInfo.getDoctorName())){
+                                    BasDoctorInfo basDoctorInfo = new BasDoctorInfo();
+                                    basDoctorInfo.setHospitalId(behospitalInfo.getHospitalId());
+                                    basDoctorInfo.setDoctorId(behospitalInfo.getDoctorId());
+                                    basDoctorInfo.setName(behospitalInfo.getDoctorName());
+                                    doctorData.add(basDoctorInfo);
+                                }
+                            }
+                    );
+                }
+
             }
         }
-        list.forEach(behospitalInfo -> {
-            if(behospitalInfo!= null){
-                BasDoctorInfo basDoctorInfo = new BasDoctorInfo();
-                basDoctorInfo.setHospitalId(behospitalInfo.getHospitalId());
-                basDoctorInfo.setDoctorId(behospitalInfo.getDoctorId());
-                basDoctorInfo.setName(behospitalInfo.getDoctorName());
-                doctorData.add(basDoctorInfo);
-            }
 
-        });
             return doctorData;
     }
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -9851,6 +9851,7 @@
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
         a.doctor_name as doctorGroup,
+        a.doctor_name as doctorName,
         sum(c.cases_entry_id = 2658) as entry_2658_num,
         sum(c.cases_entry_id = 2686) as entry_2686_num,
         sum(c.cases_entry_id = 2657) as entry_2657_num,
@@ -9927,37 +9928,11 @@
 
     <!--    病历稽查表-科室-->
     <select id="getMedicalCheckByDept" resultMap="MedicalCheckMap">
-        SELECT
-        t1.deptId,
-        t1.deptName,
-        t2.doctorGroup,
-        t1.doctorName,
-        t1.entry_2658_num,
-        t1.entry_2686_num,
-        t1.entry_2657_num,
-        t1.entry_3010_num,
-        t1.entry_2655_num,
-        t1.entry_2654_num,
-        t1.entry_2852_num,
-        t1.entry_2287_num,
-        t1.entry_3025_num,
-        t1.entry_2170_num,
-        t1.entry_2930_num,
-        t1.entry_2900_num,
-        t1.entry_2229_num,
-        t1.entry_2217_num,
-        t1.entry_2218_num,
-        t1.entry_2220_num,
-        t1.entry_2486_num,
-        t1.entry_3063_num,
-        t1.entry_3062_num,
-        t1.entry_2495_num
-        from(
         SELECT
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
         a.doctor_name as doctorName,
-        e.group_id,
+        a.doctor_name as doctorGroup,
         sum(c.cases_entry_id = 2658) as entry_2658_num,
         sum(c.cases_entry_id = 2686) as entry_2686_num,
         sum(c.cases_entry_id = 2657) as entry_2657_num,
@@ -10038,93 +10013,7 @@
         GROUP BY
         a.beh_dept_id,
         e.group_id,
-        a.`doctor_name`)t1,
-        (SELECT
-        a.beh_dept_id AS deptId,
-        a.beh_dept_name AS deptName,
-        a.doctor_name as doctorGroup,
-        e.group_id,
-        sum(c.cases_entry_id = 2658) as entry_2658_num,
-        sum(c.cases_entry_id = 2686) as entry_2686_num,
-        sum(c.cases_entry_id = 2657) as entry_2657_num,
-        sum(c.cases_entry_id = 3010) as entry_3010_num,
-        sum(c.cases_entry_id = 2655) as entry_2655_num,
-        sum(c.cases_entry_id = 2654) as entry_2654_num,
-        sum(c.cases_entry_id = 2852) as entry_2852_num,
-        sum(c.cases_entry_id = 2287) as entry_2287_num,
-        sum(c.cases_entry_id = 3025) as entry_3025_num,
-        sum(c.cases_entry_id = 2170) as entry_2170_num,
-        sum(c.cases_entry_id = 2930) as entry_2930_num,
-        sum(c.cases_entry_id = 2900) as entry_2900_num,
-        sum(c.cases_entry_id = 2229) as entry_2229_num,
-        sum(c.cases_entry_id = 2217) as entry_2217_num,
-        sum(c.cases_entry_id = 2218) as entry_2218_num,
-        sum(c.cases_entry_id = 2220) as entry_2220_num,
-        sum(c.cases_entry_id = 2486) as entry_2486_num,
-        sum(c.cases_entry_id = 3063) as entry_3063_num,
-        sum(c.cases_entry_id = 3062) as entry_3062_num,
-        sum(c.cases_entry_id = 2495) as entry_2495_num
-        FROM
-        med_behospital_info a,
-        med_qcresult_info b,
-        med_qcresult_detail c,
-        qc_cases_entry d,
-        bas_doctor_info e,
-        sys_user_dept f
-        WHERE
-        a.is_deleted = 'N'
-        AND b.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND e.is_deleted = 'N'
-        AND f.is_deleted = 'N'
-        AND a.hospital_id = b.hospital_id
-        AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = e.hospital_id
-        AND a.hospital_id = f.hospital_id
-        AND a.behospital_code = b.behospital_code
-        AND a.behospital_code = c.behospital_code
-        AND a.beh_dept_id = f.dept_id
-        AND c.cases_entry_id = d.id
-        and a.doctor_id=e.doctor_id
-        and e.group_id is not NULL
-        AND LENGTH(e.group_id)>0
-        AND a.qc_type_id != 0
-        <if test="filterVO.userId!=null">
-            AND f.user_id = #{filterVO.userId}
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile != ''">
-            and a.is_placefile = #{filterVO.isPlacefile}
-        </if>
-        <if test="filterVO.hospitalId != null and filterVO.hospitalId != ''">
-            AND a.hospital_id = #{filterVO.hospitalId}
-        </if>
-        <if test="filterVO.name != null and filterVO.name != ''">
-            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile == 0">
-            <if test="filterVO.startDate != null ">
-                <![CDATA[ AND a.behospital_date >= #{filterVO.startDate}]]>
-            </if>
-            <if test="filterVO.endDate != null ">
-                <![CDATA[ AND a.behospital_date <= #{filterVO.endDate}]]>
-            </if>
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile == 1">
-            <if test="filterVO.startDate != null ">
-                <![CDATA[ AND a.leave_hospital_date >= #{filterVO.startDate}]]>
-            </if>
-            <if test="filterVO.endDate != null ">
-                <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
-            </if>
-        </if>
-        <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name = #{filterVO.deptName}
-        </if>
-        GROUP BY
-        a.beh_dept_id,
-        e.group_id)t2
-        where t1.group_id = t2.group_id
+        a.doctor_name
     </select>
 
     <!--    病历稽查表最新sql、id&&name-->
@@ -10307,37 +10196,11 @@
 
     <!--    病历稽查表最新导出-->
     <select id="medicalCheckExportByDept" resultMap="MedicalCheckByDeptMap">
-        SELECT
-        t1.deptId,
-        t1.deptName,
-        t2.doctorGroup,
-        t1.doctorName,
-        t1.RYJLW_24,
-        t1.SCBCJLW_8H,
-        t1.ZRSCCFW_72H,
-        t1.RYHLJBCW_3D,
-        t1.ZRCFW_2W,
-        t1.ZZCFW_3W,
-        t1.QJJLW_6H,
-        t1.HZJLW_24H,
-        t1.SQTLXJW,
-        t1.SXJLSW_24H,
-        t1.XHSCW_30M,
-        t1.SHZDCFW_24H,
-        t1.SHJBCW_3D,
-        t1.ZKJBCW_3D,
-        t1.ZKJLW_24,
-        t1.BWZHJLBCW_MD,
-        t1.SXHWJL,
-        t1.SXPJW_24,
-        t1.WJZWJL,
-        t1.WYWWCXJ
-        from(
         SELECT
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
+        a.doctor_name as doctorGroup,
         a.doctor_name as doctorName,
-        e.group_id,
         GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2658 THEN a.behospital_code else null END ) as RYJLW_24,
         GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2686 THEN a.behospital_code else null END ) as SCBCJLW_8H,
         GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2657 THEN a.behospital_code else null END ) as ZRSCCFW_72H,
@@ -10418,93 +10281,7 @@
         GROUP BY
         a.beh_dept_id,
         e.group_id,
-        a.`doctor_name`)t1,
-        (SELECT
-        a.beh_dept_id AS deptId,
-        a.beh_dept_name AS deptName,
-        a.doctor_name as doctorGroup,
-        e.group_id,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2658 THEN a.behospital_code else null END ) as RYJLW_24,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2686 THEN a.behospital_code else null END ) as SCBCJLW_8H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2657 THEN a.behospital_code else null END ) as ZRSCCFW_72H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3010 THEN a.behospital_code else null END ) as RYHLJBCW_3D,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2655 THEN a.behospital_code else null END ) as ZRCFW_2W,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2654 THEN a.behospital_code else null END ) as ZZCFW_3W,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2852 THEN a.behospital_code else null END ) as QJJLW_6H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2287 THEN a.behospital_code else null END ) as HZJLW_24H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3025 THEN a.behospital_code else null END ) as SQTLXJW,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2170 THEN a.behospital_code else null END ) as SXJLSW_24H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2930 THEN a.behospital_code else null END ) as XHSCW_30M,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2900 THEN a.behospital_code else null END ) as SHZDCFW_24H,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2229 THEN a.behospital_code else null END ) as SHJBCW_3D,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2217 THEN a.behospital_code else null END ) as ZKJBCW_3D,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2218 THEN a.behospital_code else null END ) as ZKJLW_24,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2220 THEN a.behospital_code else null END ) as BWZHJLBCW_MD,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2486 THEN a.behospital_code else null END ) as SXHWJL,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3063 THEN a.behospital_code else null END ) as SXPJW_24,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 3062 THEN a.behospital_code else null END ) as WJZWJL,
-        GROUP_CONCAT(DISTINCT case when c.cases_entry_id = 2495 THEN a.behospital_code else null END ) as WYWWCXJ
-        FROM
-        med_behospital_info a,
-        med_qcresult_info b,
-        med_qcresult_detail c,
-        qc_cases_entry d,
-        bas_doctor_info e,
-        sys_user_dept f
-        WHERE
-        a.is_deleted = 'N'
-        AND b.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND e.is_deleted = 'N'
-        AND f.is_deleted = 'N'
-        AND a.hospital_id = b.hospital_id
-        AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = e.hospital_id
-        AND a.hospital_id = f.hospital_id
-        AND a.behospital_code = b.behospital_code
-        AND a.behospital_code = c.behospital_code
-        AND a.beh_dept_id = f.dept_id
-        AND c.cases_entry_id = d.id
-        and a.doctor_id=e.doctor_id
-        and e.group_id is not NULL
-        AND LENGTH(e.group_id)>0
-        AND a.qc_type_id != 0
-        <if test="filterVO.userId!=null">
-            AND f.user_id = #{filterVO.userId}
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile != ''">
-            and a.is_placefile = #{filterVO.isPlacefile}
-        </if>
-        <if test="filterVO.hospitalId != null and filterVO.hospitalId != ''">
-            AND a.hospital_id = #{filterVO.hospitalId}
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile == 0">
-            <if test="filterVO.startDate != null ">
-                <![CDATA[ AND a.behospital_date >= #{filterVO.startDate}]]>
-            </if>
-            <if test="filterVO.endDate != null ">
-                <![CDATA[ AND a.behospital_date <= #{filterVO.endDate}]]>
-            </if>
-        </if>
-        <if test="filterVO.isPlacefile != null and filterVO.isPlacefile == 1">
-            <if test="filterVO.startDate != null ">
-                <![CDATA[ AND a.leave_hospital_date >= #{filterVO.startDate}]]>
-            </if>
-            <if test="filterVO.endDate != null ">
-                <![CDATA[ AND a.leave_hospital_date <= #{filterVO.endDate}]]>
-            </if>
-        </if>
-        <if test="filterVO.name != null and filterVO.name != ''">
-            AND a.doctor_name  like CONCAT('%', #{filterVO.name}, '%')
-        </if>
-        <if test="filterVO.deptName != null and filterVO.deptName != ''">
-            AND a.beh_dept_name = #{filterVO.deptName}
-        </if>
-        GROUP BY
-        a.beh_dept_id,
-        e.group_id)t2
-        where t1.group_id = t2.group_id
+        a.doctor_name
     </select>
 
     <!-- 未整改病历统计-->