杭州七院236环境调试

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

@@ -39,6 +39,9 @@ public class CheckJobPageVO extends Page implements Serializable {
     //病人住院序号
     @ApiModelProperty("病人住院序号")
     private String behospitalCode;
+    //病案号
+    @ApiModelProperty("病案号")
+    private String fileCode;
     //主诊断医生
     @ApiModelProperty("主诊断医生")
     private String doctorName;

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

@@ -57,6 +57,12 @@ public class CheckWorkPageVO extends Page implements Serializable {
     @ApiModelProperty("病人住院序号")
     private String behospitalCode;
 
+    /**
+     * 病案号
+     */
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
     /**
      * 病区编号集合
      */

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

@@ -51,6 +51,12 @@ public class CheckedRecordListVO extends Page implements Serializable {
     @ApiModelProperty("病人住院序号")
     private String behospitalCode;
 
+    /**
+     * 病案号
+     */
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
     /**
      * 医生姓名
      */

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

@@ -24,6 +24,10 @@ public class QcResultShortPageVO extends Page {
      * 病历号
      */
     private String behospitalCode;
+    /**
+     * 病案号
+     */
+    private String fileCode;
     /**
      * 病人姓名
      */

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

@@ -325,6 +325,7 @@ public class ConsoleByDeptController {
      */
     @ApiOperation(value = "出院人数统计-科室[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
+                    "fileCode： 病案号<br>" +
                     "patName： 病人姓名 <br>" +
                     "deptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +

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

@@ -625,6 +625,7 @@ public class ConsoleController {
      */
     @ApiOperation(value = "出院人数统计[by:zhaops]",
             notes = "behospitalCode： 病历号<br>" +
+                    "fileCode： 病案号<br>" +
                     "patName： 病人姓名 <br>" +
                     "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +

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

@@ -54,6 +54,7 @@ public class MedCheckWorkController {
                     "jobType：核查任务类型(0-科室任务 1-质控科 2-院级) <br>" +
                     "hospitalId: 医院ID<br>" +
                     "behospitalCode：病人住院序号<br>" +
+                    "fileCode：病案号<br>" +
                     "ward：病区<br>" +
                     "depts：科室<br>" +
                     "medoups：医疗组<br>" +

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.16.1.104:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lt@great
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -111,9 +111,9 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.16.1.104  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
+    host: 192.168.2.237  #Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: emrais # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -7671,6 +7671,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>
@@ -7922,6 +7925,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>

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -203,6 +203,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>
@@ -414,6 +417,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="smallDay != null">
             <![CDATA[ AND mhp.behospital_day_num >= #{smallDay}]]>
         </if>
@@ -553,8 +559,11 @@
         <if test="behospitalCode!=null and behospitalCode!=''">
             and b.behospital_code like concat('%',#{behospitalCode},'%')
         </if>
+        <if test="behospitalCode!=null and behospitalCode!=''">
+            and b.behospital_code like concat('%',#{behospitalCode},'%')
+        </if>
         <if test="doctorName!=null and doctorName!=''">
-            and b.doctor_name like concat('%',#{doctorName},'%')
+            and b.file_code like concat('%',#{fileCode},'%')
         </if>
         <if test="jobDistributionTimeStart!=null">
             and a.job_distribution_time >= #{jobDistributionTimeStart}