소스 검색

时效性报表分医院展示

SGTY 10 달 전
부모
커밋
748fcd1004
2개의 변경된 파일35개의 추가작업 그리고 13개의 파일을 삭제
  1. 5 3
      src/main/java/com/diagbot/facade/ConsoleFacade.java
  2. 30 10
      src/main/resources/mapper/BehospitalInfoMapper.xml

+ 5 - 3
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -3147,7 +3147,7 @@ public class ConsoleFacade {
 
 
     /**
-     * 未整改病历统计
+     * 时效性报表展示
      *
      * @param filterTimelinessVO
      * @return
@@ -3353,7 +3353,7 @@ public class ConsoleFacade {
 
 
     /**
-     * 未整改病历统计
+     * 时效性报表展示
      *
      * @param filterTimelinessVO
      * @return
@@ -3362,6 +3362,7 @@ public class ConsoleFacade {
         TimelinessReportDTO timelinessReportDTO = new TimelinessReportDTO();
         IPage<?> retList = new Page<>();
         List<ColumnDTO> columns = Lists.newLinkedList();
+        filterFacade.filterTimelinessVOSet(filterTimelinessVO);
 
         Integer orderNo = 1;
         ColumnDTO columnHospitalCode = new ColumnDTO();
@@ -3475,7 +3476,7 @@ public class ConsoleFacade {
 
 
     /**
-     * 未整改病历统计
+     * 时效性报表展示
      *
      * @param filterTimelinessVO
      * @return
@@ -3484,6 +3485,7 @@ public class ConsoleFacade {
         TimelinessReportDTO timelinessReportDTO = new TimelinessReportDTO();
         IPage<?> retList = new Page<>();
         List<ColumnDTO> columns = Lists.newLinkedList();
+        filterFacade.filterTimelinessVOSet(filterTimelinessVO);
 
         Integer orderNo = 1;
         ColumnDTO columnHospitalCode = new ColumnDTO();

+ 30 - 10
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3296,7 +3296,9 @@
             a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3241'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3338,7 +3340,9 @@
             a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3242'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3380,7 +3384,9 @@
             a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3243'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3410,7 +3416,9 @@
             a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3240'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3440,7 +3448,9 @@
             a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3244'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3482,7 +3492,9 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3241'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3524,7 +3536,9 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3242'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3566,7 +3580,9 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3243'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3596,7 +3612,9 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3240'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>
@@ -3626,7 +3644,9 @@
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND b.cases_entry_id = '3244'
-        AND a.hospital_id = '14'
+        <if test="hospitalId != null and hospitalId != ''">
+            AND a.hospital_id = #{hospitalId}
+        </if>
         AND a.qc_type_id <![CDATA[ <> ]]> 0
         <if test="startDate != null ">
             <![CDATA[ AND a.behospital_date >= #{startDate}]]>