소스 검색

质控评分相关页面isPlacefile改成动态的值

gaodm 4 년 전
부모
커밋
0953cb729c

+ 2 - 2
src/main/java/com/diagbot/vo/BehospitalPageVO.java

@@ -92,8 +92,8 @@ public class BehospitalPageVO extends Page implements Serializable {
     /**
      * 是否归档(0:未归档,1:已归档)
      */
-    @ApiModelProperty(hidden = true)
-    private String isPlacefile;
+//    @ApiModelProperty(hidden = true)
+    private String isPlacefile = "1";
 
     private Integer checkStatus;
 }

+ 5 - 0
src/main/java/com/diagbot/vo/ExportQcresultVO.java

@@ -28,4 +28,9 @@ public class ExportQcresultVO {
     private String deptId;
     private String name;
     private Integer checkStatus;
+
+    /**
+     * 是否归档(0:未归档,1:已归档)
+     */
+    private String isPlacefile = "1";
 }

+ 1 - 1
src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -220,7 +220,7 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "导出病历[by:gaodm]",
+    @ApiOperation(value = "导出病历例子[by:gaodm]",
             notes = "")
     @PostMapping("/exportExcel")
     @SysLogger("exportExcel")

+ 22 - 14
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -98,8 +98,7 @@
         <if test="isPlacefile != null and isPlacefile != ''">
             and t.is_placefile = #{isPlacefile}
         </if>
-        and t.qc_type_id != 0
-        and t.is_placefile = 1) p
+        and t.qc_type_id != 0) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
         and p.check_status = #{checkStatus}
@@ -332,8 +331,7 @@
         <if test="isPlacefile != null and isPlacefile != ''">
             and t.is_placefile = #{isPlacefile}
         </if>
-        and t.qc_type_id != 0
-        and t.is_placefile = 1) p
+        and t.qc_type_id != 0) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
             and p.check_status = #{checkStatus}
@@ -413,8 +411,7 @@
         <if test="isPlacefile != null and isPlacefile != ''">
             and t.is_placefile = #{isPlacefile}
         </if>
-        and t.qc_type_id != 0
-        and t.is_placefile = 1) p
+        and t.qc_type_id != 0) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
             and p.check_status = #{checkStatus}
@@ -493,8 +490,7 @@
         <if test="isPlacefile != null and isPlacefile != ''">
             and t.is_placefile = #{isPlacefile}
         </if>
-        and t.qc_type_id != 0
-        and t.is_placefile = 1) p
+        and t.qc_type_id != 0) p
         where p.is_deleted="N"
         <if test="checkStatus != null ">
             and p.check_status = #{checkStatus}
@@ -2311,7 +2307,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -2358,7 +2356,9 @@
         AND b.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -2469,7 +2469,9 @@
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.id
         AND a.beh_dept_id = e.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -2523,7 +2525,9 @@
         AND a.hospital_id = c.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.beh_dept_id = c.dept_id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -2633,7 +2637,9 @@
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
         AND c.cases_id = d.id
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         AND a.doctor_id in
             (SELECT doctor_id FROM `bas_doctor_info`
             where is_deleted = 'N' and hospital_id = #{hospitalId} and group_id in (
@@ -2700,7 +2706,9 @@
         AND b.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.behospital_code = b.behospital_code
-        AND a.is_placefile = '1'
+        <if test="isPlacefile != null and isPlacefile != ''">
+            and a.is_placefile = #{isPlacefile}
+        </if>
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}