Merge remote-tracking branch 'origin/20210512_yw_check' into 20210512_yw_check

# Conflicts:
#	src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

src/main/java/com/diagbot/enums/CheckJobTypeEnum.java

@@ -10,8 +10,8 @@ import lombok.Setter;
  */
 public enum CheckJobTypeEnum implements KeyedNamed {
     DEPT_SUPERVISOR(0, "科室任务"),
-    HOSP_SUPERVISOR(1, "院级"),
-    QUAT_SUPERVISOR(2, "质控科");
+    QUAT_SUPERVISOR(1, "质控科"),
+    HOSP_SUPERVISOR(2, "院级");
 
     @Setter
     private int key;

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

@@ -16,7 +16,10 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.*;
+import com.diagbot.vo.CheckWorkPageVO;
+import com.diagbot.vo.MedCheckWorkAddVO;
+import com.diagbot.vo.RecordTypeVO;
+import com.diagbot.vo.SysUserBaseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -82,8 +85,7 @@ public class MedCheckWorkFacade {
             }
 
             int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
-            if(i!=0)
-            {
+            if (i != 0) {
                 return true;
             }
         } else if (checkStatus != null && checkStatus == 1) {
@@ -148,14 +150,12 @@ public class MedCheckWorkFacade {
         }
         //2.批量执行插入操作
         try {
-            if (medBehospitalTypeMap!=null&&medBehospitalTypeMap.size() > 0) {
+            if (medBehospitalTypeMap != null && medBehospitalTypeMap.size() > 0) {
                 List<MedBehospitalType> medBehospitalTypeList = new ArrayList<>(medBehospitalTypeMap.values());
                 medBehospitalTypeServiceImpl.saveOrUpdateBatch(medBehospitalTypeList, batchSize);
             }
-        }
-        catch(Exception e)
-        {
-            log.error(e.getMessage(),e);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -234,6 +234,12 @@ public class MedCheckWorkFacade {
             }
         }
         checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
+
+        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()));
+        }
     }
 
     public boolean getCheckListByUserId() {
@@ -244,9 +250,7 @@ public class MedCheckWorkFacade {
         if (null != task && StringUtil.isNotBlank(task.getCron())) {
             try {
                 execute(task.getParam());
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 e.printStackTrace();
                 return false;
             }

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

@@ -40,7 +40,7 @@ public class CheckWorkPageVO extends Page implements Serializable {
     private String creatStatus="0";
 
     /**
-     * 核查任务类型(0-科室任务 1-院级 1-质控科)
+     * 核查任务类型(0-科室任务 2-院级 1-质控科)
      */
     private String jobType;
 

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

@@ -47,7 +47,7 @@ public class MedCheckWorkController {
             notes = "startDate：出院开始时间 【必填】<br>" +
                     "endDate：出院结束时间 【必填】<br>" +
                     "creatStatus：生成状态(0-未生成 1-已生成) 【必填】<br>" +
-                    "jobType：核查任务类型(0-科室任务 1-院级 1-质控科) <br>" +
+                    "jobType：核查任务类型(0-科室任务 1-质控科 2-院级) <br>" +
                     "hospitalId: 医院ID<br>" +
                     "behospitalCode：病人住院序号<br>" +
                     "departments：科室<br>" +

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -223,7 +223,7 @@
         med_behospital_info mbi
         LEFT JOIN med_home_page mhp
         ON mbi.behospital_code=mhp.behospital_code
-        AND mbi.hospital_id = mhp.hospital_id
+        AND mbi.hospital_id = mhp.hospital_id AND mhp.is_deleted = 'N'
         LEFT JOIN med_check_info mci
         ON mbi.behospital_code = mci.behospital_code
         AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
@@ -232,15 +232,18 @@
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
         LEFT JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
         AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
-        WHERE mbi.is_deleted = 'N' and mqi.score_res is not null
+        WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N' and mqi.score_res is not null
         <if test="startDate != null">
-            <![CDATA[ AND mbi.behospital_date >= #{startDate}]]>
+            <![CDATA[ AND mbi.leave_hospital_date >= #{startDate}]]>
         </if>
         <if test="endDate != null">
-            <![CDATA[ AND mbi.behospital_date < #{endDate}]]>
+            <![CDATA[ AND mbi.leave_hospital_date < #{endDate}]]>
         </if>
-        <if test="creatStatus != null and creatStatus == 1">
-            AND mci.job_create_time is not null and mci.check_type = 2
+        <if test="creatStatus != null and creatStatus == '1'">
+            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">
             AND mci.job_create_time is null
@@ -251,13 +254,12 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
-        <if test="departments !=null and departments.size() !=0">
+        <if test="departments !=null and departments.size > 0">
             and mbi.beh_dept_id in
             <foreach collection="departments" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-
         <if test="smallDay != null">
             <![CDATA[ AND mhp.behospital_day_num >= #{smallDay}]]>
         </if>