2 Commits bdf45c88ae ... 26839af824

Tác giả SHA1 Thông báo Ngày
  xiewei 26839af824 Merge remote-tracking branch 'origin/his/yiwufuyou_new' into his/yiwufuyou_new 7 tháng trước cách đây
  xiewei 715589e307 使用病案号搜索病历功能10.24 7 tháng trước cách đây

+ 2 - 1
src/main/java/com/diagbot/vo/CheckJobPageVO.java

@@ -49,6 +49,7 @@ public class CheckJobPageVO extends Page implements Serializable {
     @ApiModelProperty("筛选分值集合")
     private List<String> values;
 
-
+    @ApiModelProperty("病案号")
+    private String fileCode;
 
 }

+ 3 - 0
src/main/java/com/diagbot/vo/CheckWorkPageVO.java

@@ -112,4 +112,7 @@ public class CheckWorkPageVO extends Page implements Serializable {
     //筛选分值集合
     @ApiModelProperty("筛选分值集合")
     private List<String> values;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
 }

+ 3 - 0
src/main/java/com/diagbot/vo/CheckedRecordListVO.java

@@ -101,4 +101,7 @@ public class CheckedRecordListVO extends Page implements Serializable {
     @ApiModelProperty(hidden = true)
     private long hospitalId;
 
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
 }

+ 3 - 0
src/main/java/com/diagbot/vo/GetDetailRecordListPageVO.java

@@ -115,4 +115,7 @@ public class GetDetailRecordListPageVO extends Page implements Serializable {
 
     @ApiModelProperty(value = "改善标志(1:病案首页改善病历,2:病案首页改善至合格病历,3:病案首页改善至满分病历)")
     private Integer improveType;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
 }

+ 4 - 0
src/main/java/com/diagbot/vo/QcResultPageVO.java

@@ -154,4 +154,8 @@ public class QcResultPageVO extends Page {
 
     @ApiModelProperty("是否日间病例,1:是,0:否")
     private String isDaytime;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
 }

+ 3 - 0
src/main/java/com/diagbot/vo/QcResultPageXYVO.java

@@ -156,4 +156,7 @@ public class QcResultPageXYVO extends Page {
      * 改善标志(1:病案首页改善病历,2:病案首页改善至合格病历,3:病案首页改善至满分病历)
      */
     private Integer improveType;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
 }

+ 3 - 0
src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -151,4 +151,7 @@ public class QcResultShortPageVO extends Page {
 
     @ApiModelProperty("是否日间病例,1:是,0:否")
     private String isDaytime;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
 }

+ 4 - 0
src/main/java/com/diagbot/vo/QcResultShortXYPageVO.java

@@ -154,4 +154,8 @@ public class QcResultShortXYPageVO extends Page {
     private Integer improveType;
     @ApiModelProperty("是否日间病例,1:是,0:否")
     private String isDaytime;
+
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
 }

+ 58 - 9
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -95,15 +95,15 @@
             or t.beh_doctor_id = #{doctorCode}
             or t.director_doctor_id = #{doctorCode})
         </if>
-        <if test="fileCode != null and fileCode != ''">
-            and t.file_code like CONCAT('%',#{fileCode},'%')
-        </if>
         <if test="hospitalId != null">
             and t.hospital_id = #{hospitalId}
         </if>
         <if test="behospitalCode != null and behospitalCode != ''">
             and t.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
+        <if test="fileCode != null and fileCode != ''">
+            and t.file_code like CONCAT('%',#{fileCode},'%')
+        </if>
         <if test="behosDateStart != null">
             <![CDATA[ and t.behospital_date >= #{behosDateStart}]]>
         </if>
@@ -364,15 +364,15 @@
             or t.beh_doctor_id = #{doctorCode}
             or t.director_doctor_id = #{doctorCode})
         </if>
-        <if test="fileCode != null and fileCode != ''">
-            and t.file_code like CONCAT('%',#{fileCode},'%')
-        </if>
         <if test="hospitalId != null">
             and t.hospital_id = #{hospitalId}
         </if>
         <if test="behospitalCode != null and behospitalCode != ''">
             and t.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
+        <if test="fileCode != null and fileCode != ''">
+            and t.file_code like CONCAT('%',#{fileCode},'%')
+        </if>
         <if test="behosDateStart != null">
             <![CDATA[ and t.behospital_date >= #{behosDateStart}]]>
         </if>
@@ -1211,15 +1211,15 @@
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
         </if>
-        <if test="fileCode != null and fileCode != ''">
-            and t.file_code like CONCAT('%',#{fileCode},'%')
-        </if>
         <if test="hospitalId != null">
             and t.hospital_id = #{hospitalId}
         </if>
         <if test="behospitalCode != null and behospitalCode != ''">
             and t.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
+        <if test="fileCode != null and fileCode != ''">
+            and t.file_code like CONCAT('%',#{fileCode},'%')
+        </if>
         <if test="behosDateStart != null">
             <![CDATA[ and t.behospital_date >= #{behosDateStart}]]>
         </if>
@@ -5674,6 +5674,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -5945,6 +5948,10 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
+
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -6207,6 +6214,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -7870,6 +7880,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -8118,6 +8131,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -12502,6 +12518,12 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{behospitalCode}, '%' )
         </if>
+        <if test="fileCode != null and fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{fileCode}, '%' )
+        </if>
+        <if test="fileCode != null and fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{fileCode}, '%' )
+        </if>
         <if test="patName != null and patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{patName}, '%' )
         </if>
@@ -12692,6 +12714,9 @@
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultPageVO.fileCode != null and qcResultPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultPageVO.patName != null and qcResultPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultPageVO.patName}, '%' )
         </if>
@@ -12888,6 +12913,9 @@
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultPageVO.fileCode != null and qcResultPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultPageVO.patName != null and qcResultPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultPageVO.patName}, '%' )
         </if>
@@ -13105,6 +13133,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -13315,6 +13346,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -16776,6 +16810,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -17031,6 +17068,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -17217,6 +17257,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -17405,6 +17448,9 @@
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
+        <if test="qcResultShortPageVO.fileCode != null and qcResultShortPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{qcResultShortPageVO.fileCode}, '%' )
+        </if>
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
@@ -20725,6 +20771,9 @@
         <if test="getDetailRecordListPageVO.behospitalCode != null and getDetailRecordListPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{getDetailRecordListPageVO.behospitalCode}, '%' )
         </if>
+        <if test="getDetailRecordListPageVO.fileCode != null and getDetailRecordListPageVO.fileCode != ''">
+            AND a.file_code LIKE CONCAT( '%', #{getDetailRecordListPageVO.fileCode}, '%' )
+        </if>
         <if test="getDetailRecordListPageVO.patName != null and getDetailRecordListPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{getDetailRecordListPageVO.patName}, '%' )
         </if>

+ 9 - 0
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -148,6 +148,9 @@
                 <if test="behospitalCode !=null and behospitalCode != ''">
                     and a.behospital_code LIKE CONCAT('%',#{behospitalCode},'%')
                 </if>
+                <if test="fileCode !=null and fileCode != ''">
+                    and a.file_code LIKE CONCAT('%',#{fileCode},'%')
+                </if>
                 <if test="name !=null and name != ''">
                     and a.`name` LIKE CONCAT('%',#{name},'%')
                 </if>
@@ -294,6 +297,9 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
+        <if test="fileCode != null and fileCode != ''">
+            AND mbi.file_code like CONCAT('%',#{fileCode},'%')
+        </if>
         <if test="department !=null and department.size > 0">
             and mbi.beh_dept_id in
             <foreach collection="department" item="item" open="(" close=")" separator=",">
@@ -382,6 +388,9 @@
         <if test="behospitalCode!=null and behospitalCode!=''">
             and b.behospital_code like concat('%',#{behospitalCode},'%')
         </if>
+        <if test="fileCode!=null and fileCode!=''">
+            and b.file_code like concat('%',#{fileCode},'%')
+        </if>
         <if test="doctorName!=null and doctorName!=''">
             and b.doctor_name like concat('%',#{doctorName},'%')
         </if>