核查列表页筛选条件字段统一

pom.xml

@@ -39,8 +39,8 @@
         <patchca.version>1.1.2</patchca.version>
         <hutool.version>5.0.7</hutool.version>
         <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
-        <docker.image.prefix>192.168.2.121:5000/diagbotcloud</docker.image.prefix>
-        <registryUrl>http://192.168.2.121:5000/repository/diagbotcloud/</registryUrl>
+        <docker.image.prefix>192.168.2.241:5000/diagbotcloud</docker.image.prefix>
+        <registryUrl>http://192.168.2.241:5000/repository/diagbotcloud/</registryUrl>
     </properties>
 
     <dependencyManagement>

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

@@ -218,7 +218,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         else if (searchRoleIds.contains(CheckerRoleEnum.DEPT_SUPERVISOR.getKey() * 1l)
                 || searchRoleIds.contains(CheckerRoleEnum.HOSP_SUPERVISOR.getKey() * 1l)) {
             //查询没有指定科室
-            if (checkJobVO.getDeptList() == null || checkJobVO.getDeptList().isEmpty()) {
+            if (checkJobVO.getDepts() == null || checkJobVO.getDepts().isEmpty()) {
                 //科室获取待分配任务所在科室集合
                 if (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() == Integer.parseInt(checkJobVO.getJobType())) {
                     //获取当前用户科室
@@ -228,32 +228,33 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                             .eq("user_id", principleId)
                     ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
                     if (ListUtil.isNotEmpty(deptIds)) {
-                        checkJobVO.setDeptList(deptIds);
+                        checkJobVO.setDepts(deptIds);
                     }
                     //获取病区集合
-                    List<String> wards = regionDeptService.list(new QueryWrapper<RegionDept>()
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .eq("hospital_id", hospitalId)
-                            .in(ListUtil.isNotEmpty(deptIds), "dept_id", deptIds)
-                    ).stream().map(RegionDept::getRegionCode).collect(Collectors.toList());
-                    if (ListUtil.isNotEmpty(wards)) {
-                        checkJobVO.setWardList(wards);
-                    }
+//                    List<String> wards = regionDeptService.list(new QueryWrapper<RegionDept>()
+//                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                            .eq("hospital_id", hospitalId)
+//                            .in(ListUtil.isNotEmpty(deptIds), "dept_id", deptIds)
+//                    ).stream().map(RegionDept::getRegionCode).collect(Collectors.toList());
+//                    if (ListUtil.isNotEmpty(wards)) {
+//                        checkJobVO.setRecords(wards);
+//                    }
 
-                    //医疗组
-                    List<String> doctorIds = sysUserFacade.list(new QueryWrapper<SysUser>()
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .eq("id", principleId)
-                    ).stream().map(SysUser::getUsername).collect(Collectors.toList());
-                    if (ListUtil.isNotEmpty(doctorIds)) {
-                        List<String> medoups = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
-                                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                                .in("doctor_id", doctorIds)
-                        ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
-                        if (ListUtil.isNotEmpty(medoups)) {
-                            checkJobVO.setMedoupList(medoups);
-                        }
-                    }
+                    //医疗组(没给医疗组条件默认全部）
+
+//                    List<String> doctorIds = sysUserFacade.list(new QueryWrapper<SysUser>()
+//                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                            .eq("id", principleId)
+//                    ).stream().map(SysUser::getUsername).collect(Collectors.toList());
+//                    if (ListUtil.isNotEmpty(doctorIds)) {
+//                        List<String> medoups = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
+//                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                                .in("doctor_id", doctorIds)
+//                        ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
+//                        if (ListUtil.isNotEmpty(medoups)) {
+//                            checkJobVO.setMedoups(medoups);
+//                        }
+//                    }
                     return getCheckList(checkJobVO);
                 }
                 //院区获取

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

@@ -312,21 +312,26 @@ public class MedCheckWorkFacade {
 //                deptIds.add("999999999999");
 //            }
 //            checkWorkPageVO.setDepartment(deptIds);
-            //如果没有添加医疗组筛选条件默认筛选自身医疗组
+            //如果没有添加医疗组筛选条件默认筛选全部医疗组
             List<String> codes = null;
-            if (ListUtil.isEmpty(checkWorkPageVO.getMedoup())) {
-                List<String> doctorIds = sysUserFacade.list(new QueryWrapper<SysUser>()
+            if (ListUtil.isEmpty(checkWorkPageVO.getMedoups())) {
+                //获取当前用户科室
+                SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
+                sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
+                List<String> deptIds = new ArrayList<>();
+                List<BasDeptInfoDTO> selDepts = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts();
+                if (ListUtil.isNotEmpty(selDepts)) {
+                    deptIds = selDepts.stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+                }
+                //通过科室获取医疗组
+                List<DeptMedoup> deptMedoups = deptMedoupService.list(new QueryWrapper<DeptMedoup>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("id", SysUserUtils.getCurrentPrincipleID())
-                ).stream().map(SysUser::getUsername).collect(Collectors.toList());
-                if (ListUtil.isNotEmpty(doctorIds)) {
-                    codes = medoupUserService.list(new QueryWrapper<BasDoctorInfo>()
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .in("doctor_id", doctorIds)
-                    ).stream().map(BasDoctorInfo::getGroupId).collect(Collectors.toList());
+                        .in("dept_id", deptIds));
+                if (ListUtil.isNotEmpty(deptMedoups)) {
+                    codes = deptMedoups.stream().map(DeptMedoup::getMedoupCode).collect(Collectors.toList());
                 }
             } else {
-                codes = checkWorkPageVO.getMedoup();
+                codes = checkWorkPageVO.getMedoups();
             }
             if (ListUtil.isNotEmpty(codes)) {
                 List<BasDoctorInfo> basDoctorInfos = basDoctorInfoFacade.list(new QueryWrapper<BasDoctorInfo>()

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

@@ -44,11 +44,11 @@ public class CheckJobPageVO extends Page implements Serializable {
     private String doctorName;
     //科室id集合
     @ApiModelProperty("科室id集合")
-    private List<String> deptList;
+    private List<String> depts;
     @ApiModelProperty("病区集合")
-    private List<String> wardList;
+    private List<String> wards;
     @ApiModelProperty("医疗组集合")
-    private List<String> medoupList;
+    private List<String> medoups;
     //筛选分值集合
     @ApiModelProperty("筛选分值集合")
     private List<String> values;

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

@@ -61,17 +61,17 @@ public class CheckWorkPageVO extends Page implements Serializable {
      * 病区编号集合
      */
     @ApiModelProperty("病区编号集合")
-    private List<String> region;
+    private List<String> wards;
     /**
      * 科室编号集合
      */
     @ApiModelProperty("科室编号集合")
-    private List<String> department;
+    private List<String> depts;
     /**
      * 医疗组编号集合
      */
     @ApiModelProperty("医疗组编号集合")
-    private List<String> medoup;
+    private List<String> medoups;
     /**
      * 病人住院序号集合
      */

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

@@ -36,8 +36,8 @@ public class CheckedRecordListVO extends Page implements Serializable {
     /**
      * 科室
      */
-    @ApiModelProperty("科室")
-    private String behDeptId;
+    @ApiModelProperty("科室id集合")
+    private List<String> depts;
 
     /**
      * 病人姓名
@@ -89,11 +89,10 @@ public class CheckedRecordListVO extends Page implements Serializable {
     @ApiModelProperty(hidden = true)
     private String currentDeptIds;
 
-    @ApiModelProperty("病区编号")
-    private String regionCode;
-
-    @ApiModelProperty("医疗组编号")
-    private String medoupCode;
+    @ApiModelProperty("病区集合")
+    private List<String> wards;
+    @ApiModelProperty("医疗组集合")
+    private List<String> medoups;
     /**
      * 当前用户下级普通质控员Id集合
      */

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

@@ -54,9 +54,9 @@ public class MedCheckWorkController {
                     "jobType：核查任务类型(0-科室任务 1-质控科 2-院级) <br>" +
                     "hospitalId: 医院ID<br>" +
                     "behospitalCode：病人住院序号<br>" +
-                    "region：病区<br>" +
-                    "departments：科室<br>" +
-                    "medoup：医疗组<br>" +
+                    "ward：病区<br>" +
+                    "depts：科室<br>" +
+                    "medoups：医疗组<br>" +
                     "level：病历等级<br>" +
                     "name：病人姓名<br>" +
                     "doctorName：医生姓名<br>" +

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -208,21 +208,21 @@
                 <if test="name !=null and name != ''">
                     and a.`name` LIKE CONCAT('%',#{name},'%')
                 </if>
-                <if test="deptList !=null and deptList.size()!=0 ">
+                <if test="depts !=null and depts.size()!=0 ">
                     and a.beh_dept_id in
-                    <foreach collection="deptList" item="item" open="(" close=")" separator=",">
+                    <foreach collection="depts" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                 </if>
-                <if test="wardList !=null and wardList.size()!=0 ">
+                <if test="wards !=null and wards.size()!=0 ">
                     AND a.ward_code in
-                    <foreach collection="wardList" item="item" open="(" close=")" separator=",">
+                    <foreach collection="wards" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                 </if>
-                <if test="medoupList !=null and medoupList.size()!=0 ">
+                <if test="medoups !=null and medoups.size()!=0 ">
                     AND mu.group_id in
-                    <foreach collection="medoupList" item="item" open="(" close=")" separator=",">
+                    <foreach collection="medoups" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                 </if>
@@ -395,9 +395,9 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
-        <if test="department !=null and department.size > 0">
+        <if test="depts !=null and depts.size > 0">
             and mbi.beh_dept_id in
-            <foreach collection="department" item="item" open="(" close=")" separator=",">
+            <foreach collection="depts" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -431,9 +431,9 @@
                 #{item}
             </foreach>
         </if>
-        <if test="region !=null and region.size > 0">
+        <if test="wards !=null and wards.size > 0">
             AND mbi.ward_code IN
-            <foreach collection="region" item="item" open="(" close=")" separator=",">
+            <foreach collection="wards" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -494,18 +494,25 @@
         <if test="status!=null">
             and a.`status`=#{status}
         </if>
-        <if test="behDeptId!=null and behDeptId!=''">
-            and b.beh_dept_id=#{behDeptId}
-        </if>
-        <if test="regionCode!=null and regionCode!=''">
-            and b.ward_code = #{regionCode}
+        <if test="depts !=null and depts.size()!=0 ">
+            and b.beh_dept_id in
+            <foreach collection="depts" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <if test="regionCode!=null and regionCode!=''">
-            and b.ward_code = #{regionCode}
+        <if test="wards !=null and wards.size()!=0 ">
+            AND b.ward_code in
+            <foreach collection="wards" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
-        <if test="medoupCode!=null and medoupCode!=''">
-            and medoup.`code` = #{medoupCode}
+        <if test="medoups !=null and medoups.size()!=0 ">
+            AND  medoup.`code` in
+            <foreach collection="medoups" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
+
         <if test="name!=null and name!=''">
             and b.`name` like concat('%',#{name},'%')
         </if>