病案首页合格数内页/导出

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

@@ -322,7 +322,7 @@ public class ConsoleExportFacade {
     }
 
     /**
-     * 病案首页不合格数
+     * 病案首页不合格/合格数
      *
      * @param qcResultShortPageVO
      * @return
@@ -349,7 +349,13 @@ public class ConsoleExportFacade {
         qcResultShortPageVO.setSize(Long.MAX_VALUE);
         qcResultShortPageVO.setSearchCount(false);
         List<ExportExcelDTO> records = behospitalInfoFacade.badLevelPagePageExport(qcResultShortPageVO);
-        String fileName = "病案首页不合格数病历详情页.xls";
+        String fileName = null;
+        if("不合格数".equals(qcResultShortPageVO.getTitleName())){
+             fileName = "病案首页不合格数病历详情页.xls";
+        }else{
+             fileName = "病案首页合格数病历详情页.xls";
+        }
+
         ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
     }
 

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

@@ -1175,7 +1175,7 @@ public class ConsoleFacade {
     }
 
     /**
-     * 不合格数病历号（内页）
+     * 不合格/合格数病历号（内页）
      *
      * @param qcResultPageVO
      * @return

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

@@ -350,7 +350,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     public IPage<QcResultShortDTO> unModifyMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
-     * 不合格数病历号（内页）
+     * 不合格/合格数病历号（内页）
      *
      * @param qcResultPageVO
      * @return
@@ -369,7 +369,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
 
 
     /**
-     * 病案首页不合格数病历详情页导出
+     * 病案首页不合格/合格数病历详情页导出
      *
      * @param qcResultShortPageVO
      * @return

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

@@ -495,7 +495,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     }
 
     /**
-     * 不合格数病历号（内页）
+     * 不合格/合格数病历号（内页）
      *
      * @param qcResultPageVO
      * @return
@@ -517,7 +517,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     }
 
     /**
-     * 病案首页不合格数病历详情页导出
+     * 病案首页不合格/合格数病历详情页导出
      *
      * @param qcResultShortPageVO
      * @return

src/main/java/com/diagbot/vo/QcResultPageVO.java

@@ -29,6 +29,12 @@ public class QcResultPageVO extends Page {
      * 病人姓名
      */
     private String patName;
+
+    /**
+     * title名称
+     */
+    private String titleName;
+
     /**
      * 条目名称
      */

src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -32,6 +32,12 @@ public class QcResultShortPageVO extends Page {
      * 条目名称
      */
     private String casesEntryName;
+
+    /**
+     * title名称
+     */
+    private String titleName;
+
     /**
      * 条目id
      */
@@ -126,4 +132,4 @@ public class QcResultShortPageVO extends Page {
      * 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历）
      */
     private Integer improveType;
-}
+}

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

@@ -447,10 +447,11 @@ public class ConsoleController {
      * @param qcResultPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格数病历详情(内页)[by:cy]",
+    @ApiOperation(value = "病案首页不合格/合格数病历详情(内页)[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
+                    "titleName： 标题名称 <br>" +
                     "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +

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

@@ -336,12 +336,12 @@ public class ConsoleExportController {
     }
 
     /**
-     * 病案首页不合格数病历详情页导出
+     * 病案首页不合格/合格数病历详情页导出
      *
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格数病历详情页导出[by:cy]",
+    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "behDeptName：科室名称 <br>" +

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6771,7 +6771,7 @@
         d.NAME
     </select>
 
-    <!-- 不合格数病历号（内页）-->
+    <!-- 不合格/合格数病历号（内页）-->
     <select id="badLevelPage" resultType="com.diagbot.dto.QcResultShortDTO">
         SELECT t.*
         FROM
@@ -6858,8 +6858,15 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = e.behospital_code
         AND a.qc_type_id != 0
-        AND e.`level`='不合格'
-        AND e.cases_id= 243
+        AND e.cases_id = 243
+        <if test="qcResultPageVO.titleName != null ">
+            <if test="qcResultPageVO.titleName == '不合格数'">
+                AND e.`level`='不合格'
+            </if>
+            <if test="qcResultPageVO.titleName == '合格数'">
+                AND e.`level`='合格'
+            </if>
+        </if>
         <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
@@ -7141,7 +7148,7 @@
         </if>
     </select>
 
-    <!-- 病案首页不合格数病历详情页导出-->
+    <!-- 病案首页不合格/合格数病历详情页导出-->
     <select id="badLevelPagePageExport" resultMap="ExportExcelMap">
         SELECT
         f1.behDeptId,
@@ -7270,7 +7277,14 @@
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.cases_id
         AND a.qc_type_id != 0
-        AND c.`level`='不合格'
+        <if test="qcResultShortPageVO.titleName != null ">
+            <if test="qcResultShortPageVO.titleName == '不合格数'">
+                AND c.`level`='不合格'
+            </if>
+            <if test="qcResultShortPageVO.titleName == '合格数'">
+                AND c.`level`='合格'
+            </if>
+        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
@@ -7474,7 +7488,14 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.cases_id
-        AND c.`level`='不合格'
+        <if test="qcResultShortPageVO.titleName != null ">
+            <if test="qcResultShortPageVO.titleName == '不合格数'">
+                AND c.`level`='不合格'
+            </if>
+            <if test="qcResultShortPageVO.titleName == '合格数'">
+                AND c.`level`='合格'
+            </if>
+        </if>
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}