时效性条目病历展示导出字段调整

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

@@ -939,7 +939,7 @@ public class ConsoleByDeptFacade {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> unModifyMRByDept(QcResultShortPageVO qcResultShortPageVO) {
+    public IPage<QcResultShortDeptDTO> unModifyMRByDept(QcResultShortPageVO qcResultShortPageVO) {
         filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
         return behospitalInfoFacade.unModifyMRByDept(qcResultShortPageVO);
     }

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

@@ -526,7 +526,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 不合格/合格数病历号（内页）

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

@@ -516,7 +516,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param qcResultShortPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 不合格数病历号（内页）

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

@@ -868,7 +868,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public IPage<QcResultShortDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
+    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.unModifyMRByDept(qcResultShortPageVO);
     }
 

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -476,7 +476,7 @@ public class ConsoleByDeptController {
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/unModifyMRPageByDept")
     @SysLogger("unModifyMRPageByDept")
-    public RespDTO<IPage<QcResultShortDTO>> unModifyMRPageByDept(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+    public RespDTO<IPage<QcResultShortDeptDTO>> unModifyMRPageByDept(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         return RespDTO.onSuc(consoleByDeptFacade.unModifyMRByDept(qcResultShortPageVO));
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5641,7 +5641,7 @@
              t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-          and  t3.name = #{qcResultShortPageVO.medoupName}
+          and  t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -7568,7 +7568,7 @@
             AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             and t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -9225,7 +9225,7 @@
             AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             and t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -9468,7 +9468,7 @@
             AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             and t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -11963,8 +11963,8 @@
     </select>
 
     <!-- 未整改病历质控评分页-科室（内页）-->
-    <select id="unModifyMRByDept" resultType="com.diagbot.dto.QcResultShortDTO">
-        SELECT t.*
+    <select id="unModifyMRByDept" resultType="com.diagbot.dto.QcResultShortDeptDTO">
+        SELECT t.*,t3.name as medoupName
         FROM
         (SELECT DISTINCT
         t1.hospital_id AS hospitalId,
@@ -12063,6 +12063,9 @@
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
+        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
+            and a.ward_name LIKE CONCAT( '%',#{qcResultShortPageVO.wardName}, '%' )
+        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
@@ -12139,11 +12142,18 @@
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
         AND t2.is_deleted = 'N'
-        ) t
+        ) t LEFT JOIN bas_doctor_info t2 ON t.doctorId  = t2.doctor_id
+        AND t.hospitalId  = t2.hospital_id
+        AND t2.is_deleted = 'N'
+        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
+        AND t3.is_deleted = 'N'
         where 1=1
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
+        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
+            AND t3.name like concat('%', #{qcResultShortPageVO.medoupName}, '%')
+        </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
         </if>
@@ -12895,7 +12905,7 @@
             AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -13128,7 +13138,7 @@
             AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -13625,6 +13635,8 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
+        f1.wardName,
+        f1.medoupName,
         f1.doctorName,
         f1.patName,
         f1.behospitalCode,
@@ -13646,6 +13658,8 @@
         (SELECT
         t.doctorName,
         t.doctorId,
+        t.wardName,
+        t3.name as medoupName,
         t.`name` AS patName,
         t.behospitalCode AS behospitalCode,
         t.behospitalDate AS behospitalDate,
@@ -13783,6 +13797,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
+        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
+            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
+        </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
@@ -13849,7 +13866,15 @@
         LEFT JOIN qc_cases_entry qce ON qce.is_deleted = 'N'
         AND qd.cases_id = qce.cases_id
         AND qd.cases_entry_id = qce.id
+        LEFT JOIN bas_doctor_info t2 ON t.doctorId  = t2.doctor_id
+        AND t.hospitalId = t2.hospital_id
+        AND t2.is_deleted = 'N'
+        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
+        AND t3.is_deleted = 'N'
         where 1=1
+        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
+            AND t3.name like concat('%', #{qcResultShortPageVO.medoupName}, '%')
+        </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
@@ -14005,6 +14030,9 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
+        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
+            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
+        </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
@@ -14058,7 +14086,15 @@
         LEFT JOIN med_qcresult_info qi ON qi.is_deleted = 'N'
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
+        LEFT JOIN bas_doctor_info t2 ON t.doctorId = t2.doctor_id
+        AND t.hospitalId = t2.hospital_id
+        AND t2.is_deleted = 'N'
+        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
+        AND t3.is_deleted = 'N'
         where 1=1
+        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
+            AND t3.name like concat('%', #{qcResultShortPageVO.medoupName}, '%')
+        </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
@@ -15215,7 +15251,7 @@
             and m1.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND m1.ward_name = #{qcResultShortPageVO.wardName}
+            AND m1.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND m1.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -15274,7 +15310,7 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND a.ward_name = #{qcResultShortPageVO.wardName}
+            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
             <if test="qcResultShortPageVO.startDate != null ">
@@ -15346,7 +15382,7 @@
         WHERE
         1 = 1
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -15652,7 +15688,7 @@
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and a.ward_name = #{qcResultShortPageVO.wardName}
+            and a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -15727,7 +15763,7 @@
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
@@ -16450,7 +16486,7 @@
             and m1.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and m1.ward_name = #{qcResultShortPageVO.wardName}
+            and m1.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND m1.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -16506,7 +16542,7 @@
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and a.ward_name = #{qcResultShortPageVO.wardName}
+            and a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -16591,7 +16627,7 @@
         </if>
         where 1=1
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -16728,7 +16764,7 @@
             and m1.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and m1.ward_name = #{qcResultShortPageVO.wardName}
+            and m1.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND m1.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -16781,7 +16817,7 @@
             AND f.user_id = #{qcResultShortPageVO.userId}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and a.ward_name = #{qcResultShortPageVO.wardName}
+            and a.ward_nameLIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
@@ -16857,7 +16893,7 @@
         AND t3.is_deleted = 'N'
         where 1=1
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -17474,7 +17510,7 @@
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and a.ward_name = #{qcResultShortPageVO.wardName}
+            and a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
@@ -17534,7 +17570,7 @@
         </if>
         where 1=1
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
@@ -17658,7 +17694,7 @@
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
         <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            and a.ward_name = #{qcResultShortPageVO.wardName}
+            and a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
@@ -17728,7 +17764,7 @@
         AND t3.is_deleted = 'N'
         where 1=1
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
-            AND t3.name = #{qcResultShortPageVO.medoupName}
+            AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}