生成核查任务vip、开房病区查询改为配置方式

doc/035.20211108_2.1.0/qc_initv2.1.0.sql

@@ -182,8 +182,10 @@ UPDATE med_behospital_info a set a.bed_code = '-' where a.hospital_id =14  and (
 
 UPDATE med_behospital_info a set a.bed_name = '-' where a.hospital_id =14  and (a.bed_name is null or a.bed_name = '' or a.bed_name = '—' or LENGTH(a.bed_name)>64);
 
-
-
+/**
+七院生成核查任务，vip开房病区科室id配置
+ */
+INSERT INTO `sys_hospital_set` (`hospital_id`, `name`, `code`, `value`, `remark`) VALUES ('14', '病历核查（杭州七院，科室医生特殊病历）', 'check_order_info', '2015,2019', '科室核查任务除了本科室还要VIP、开放病区医生病历')
 
 
 

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

@@ -33,6 +33,7 @@ import com.diagbot.service.impl.RegionDeptServiceImpl;
 import com.diagbot.service.impl.RegionServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.SpringContextUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.CheckWorkPageVO;
@@ -45,6 +46,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -86,7 +88,8 @@ public class MedCheckWorkFacade {
     private BasDoctorInfoFacade medoupUserService;
     @Autowired
     private BasDoctorInfoFacade basDoctorInfoFacade;
-
+    @Autowired
+    private SysHospitalSetFacade sysHospitalSetFacade;
     /**
      * @Author songxl
      * @Description 批量操作核查任务（增加和删除）
@@ -342,6 +345,11 @@ public class MedCheckWorkFacade {
                         .in(ListUtil.isNotEmpty(checkWorkPageVO.getDepts()),"dept_id",checkWorkPageVO.getDepts()));
                 checkWorkPageVO.setDoctorIds(basDoctorInfos.stream().map(BasDoctorInfo::getDoctorId).collect(Collectors.toList()));
             }
+            //获取VIP开房病区科室id
+            String deptsStr = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "check_order_info");
+            if(StringUtil.isNotEmpty(deptsStr)){
+                checkWorkPageVO.setOrderDepts(Arrays.asList(deptsStr.split(",")));
+            }
         }
     }
 

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

@@ -77,6 +77,11 @@ public class CheckWorkPageVO extends Page implements Serializable {
      */
     @ApiModelProperty(hidden = true)
     private List<String> behospitalCodes;
+    /**
+     * 其他病区集合
+     */
+    @ApiModelProperty(hidden = true)
+    private List<String> orderDepts;
 
     /**
      * 病历等级

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -458,8 +458,11 @@
             </foreach>
         </if>
 
-        <if test="doctorIds !=null and doctorIds.size > 0">
-            OR (mbi.beh_dept_id in (2015,2019)
+        <if test="doctorIds !=null and doctorIds.size > 0 and orderDepts !=null and orderDepts.size>0">
+            OR (mbi.beh_dept_id in
+            <foreach collection="orderDepts" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
             and mbi.doctor_id IN
             <foreach collection="doctorIds" item="item" open="(" close=")" separator=",">
                 #{item}