Merge branch '20210512_yw_check' of http://192.168.2.236:10080/gaodm/mrqc-sys into 20210512_yw_check

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

@@ -247,7 +247,14 @@ public class MedCheckWorkFacade {
         if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
             SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
             sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-            checkWorkPageVO.setDepartments(sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList()));
+            List<String> deptIds = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+            if (ListUtil.isNotEmpty(checkWorkPageVO.getDepartment())) {
+                deptIds.retainAll(checkWorkPageVO.getDepartment());
+            }
+            if (ListUtil.isEmpty(deptIds)) {
+                deptIds.add("999999999999");
+            }
+            checkWorkPageVO.setDepartment(deptIds);
         }
     }
 

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

@@ -61,7 +61,7 @@ public class CheckWorkPageVO extends Page implements Serializable {
      * 科室编号集合
      */
     @ApiModelProperty("科室编号集合")
-    private List<String> departments;
+    private List<String> department;
 
     /**
      * 病历等级

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -203,10 +203,10 @@
         mbi.file_code fileCode,
         mbi.sex,
         mhp.age,
-        mbi.beh_dept_name behospitalDept,
+        mbi.beh_dept_name behDeptName,
         mbi.leave_hospital_date leaveHospitalDate,
         mhp.behospital_day_num behospitalDayNum,
-        mbi.doctor_name attendingDoctor,
+        mbi.doctor_name doctorName,
         mqi.score_res scoreRes,
         mqi.level,
         mbi.diagnose,
@@ -242,13 +242,13 @@
         <if test="endDate != null">
             <![CDATA[ AND mbi.leave_hospital_date < #{endDate}]]>
         </if>
-        <if test="creatStatus != null and creatStatus == '1'">
+        <if test="creatStatus != null and creatStatus == '1'.toString()">
             AND mci.job_create_time is not null
             <if test="jobType != null and jobType != ''">
                 AND mci.job_type=#{jobType}
             </if>
         </if>
-        <if test="creatStatus != null and creatStatus == 0">
+        <if test="creatStatus != null and creatStatus == '0'.toString()">
             AND mci.job_create_time is null
         </if>
         <if test="name != null and name != ''">
@@ -257,9 +257,9 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
-        <if test="departments !=null and departments.size > 0">
+        <if test="department !=null and department.size > 0">
             and mbi.beh_dept_id in
-            <foreach collection="departments" item="item" open="(" close=")" separator=",">
+            <foreach collection="department" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>