Merge branch 'develop' into dev/20200713_1.3.7.3

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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -32,4 +33,6 @@ public class TaskVO {
     private Date endLeaveDate;
     // 是否使用CRF缓存
     private boolean useCrfCache;
+    // 指定编码列表
+    private List<String> behospitalCodeList = new ArrayList<>();
 }

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

@@ -162,7 +162,8 @@ public class BehospitalInfoController {
                     "【个性化需求】——默认即可<br>" +
                     "filterFlag： 筛选病历数据：0：未评分的病历【推荐使用】；1：全部病历【谨慎使用】<br>" +
                     "individuation：【1：近3天不含当天的病历强制评分更新】<br>" +
-                    "type：【1：出院时间比当前时间早3天前的病历（例如：长兴病历）】)<br>")
+                    "type：【1：出院时间比当前时间早3天前的病历（例如：长兴病历）】)<br>" +
+                    "behospitalCodeList：指定病历号<br>")
     @PostMapping("/execule")
     @SysLogger("execule")
     public RespDTO<Boolean> execule(@RequestBody TaskVO taskVO) {

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -236,6 +236,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="behospitalCodeList != null and behospitalCodeList.size > 0 ">
+            and a.behospital_code in
+            <foreach collection="behospitalCodeList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="individuation != null and individuation.contains(1)">
             union
             select * from med_behospital_info b