义乌核查-字段名和表结构统一

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

@@ -188,7 +188,7 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该用户不是核查监管人员!");
         }
         //质控科监管人员
-        if(searchRoleIds.contains(5L)&&"2".equals(checkJobVO.getCheckType()))
+        if(searchRoleIds.contains(5L)&&"2".equals(checkJobVO.getJobType()))
         {
             String zkkDeptId = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -211,8 +211,8 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
             }
         }
         //临床科室监管人员、院级监管人员
-        else if(searchRoleIds.contains(4L)&&"0".equals(checkJobVO.getCheckType())||
-                searchRoleIds.contains(6L)&&"1".equals(checkJobVO.getCheckType()))
+        else if(searchRoleIds.contains(4L)&&"0".equals(checkJobVO.getJobType())||
+                searchRoleIds.contains(6L)&&"1".equals(checkJobVO.getJobType()))
         {
             return baseMapper.getCheckList(checkJobVO);
         }
@@ -550,6 +550,8 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
                     .eq("status",1);
             SysUser user = sysUserFacade.getOne(userQuer);
             String principleName = user.getLinkman();
+            //用户名称如果是null(目的：分配用户名为null表示用户未分配)
+            if(principleName==null){principleName = "";}
             Date now = DateUtil.now();
             //3.2分配核查任务
             return  this.update(new UpdateWrapper<MedCheckInfo>()

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

@@ -53,7 +53,7 @@ public class MedCheckWorkFacade {
         boolean flag = false;
         Date now = DateUtil.now();
         //获取核查任务类型(0-科室任务 1-院级 2-质控科)
-        Integer workType = medCheckWorkVO.getWorkType();
+        Integer workType = medCheckWorkVO.getJobType();
         //获取操作类型（0-取消，1-添加）
         Integer checkType = medCheckWorkVO.getCheckType();
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
@@ -78,6 +78,10 @@ public class MedCheckWorkFacade {
             }
 
             int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
+            if(i!=0)
+            {
+                return true;
+            }
         } else if (checkType != null && checkType == 1) {
             //生成核查任务
             MedCheckInfo data = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
@@ -102,7 +106,7 @@ public class MedCheckWorkFacade {
                 medCheckInfo.setJobCreator(principleId);
                 medCheckInfo.setJobCreatorName(principleName);
                 medCheckInfo.setJobCreateTime(now);
-                medCheckInfo.setJobType(medCheckWorkVO.getWorkType());
+                medCheckInfo.setJobType(medCheckWorkVO.getJobType());
                 medCheckInfoList.add(medCheckInfo);
             }
             flag = medCheckInfoServiceImpl.saveBatch(medCheckInfoList);

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

@@ -20,7 +20,7 @@ public class CheckJobVO {
     //出院结束时间
     private String behosDateEnd;
     //任务类型
-    private String checkType;
+    private String jobType;
     //核查用户id
     private String checkId;
     //病人姓名

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

@@ -21,8 +21,8 @@ public class MedCheckWorkAddVO {
     private Long hospitalId;            //医院id
     private List<String> behospitalCodeList = new ArrayList<>(); // 病历id
     @ApiModelProperty(hidden = true)
-    private String workCreator;         // 创建用户编号
-    private Integer workType;           // 任务类型 0-科室任务 1-院级 1-质控科
+    private String jobCreator;         // 创建用户编号
+    private Integer jobType;           // 任务类型 0-科室任务 1-院级 1-质控科
     private Integer checkStatus;        // 操作类型 0-取消，1-添加
     private String createTime;          // 操作时间
     private Integer checkType;          // 核查类型 0病历，1病案首页,2全部 默认

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

@@ -66,7 +66,7 @@ public class MedCheckInfoController {
                     "或<br>" +
                     "behosDateStart：  出院开始时间 必填<br>" +
                     "behosDateEnd：  出院结束时间 必填<br>" +
-                    "checkType：核查类型 必填 0-科室任务 1-院级 2-质控科<br>" +
+                    "jobType：核查任务类型 必填 0-科室任务 1-院级 2-质控科<br>" +
                     "deptList：科室id集合，必填<br>")
     @PostMapping("/getCheckList")
     @SysLogger("getCheckList")

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

@@ -32,7 +32,7 @@ public class MedCheckWorkController {
     @ApiOperation(value = "生成/取消核查任务[by:wangsy]",
             notes = "生成/取消核查任务 <br>" +
             "behospitalCodeList：病历id(List) 【必填】<br>" +
-            "workType：任务类型(0-科室任务 1-院级 1-质控科) 【必填】<br>" +
+            "jobType：核查任务类型(0-科室任务 1-院级 1-质控科) 【必填】<br>" +
             "checkStatus：操作类型(0-取消，1-添加) 【必填】<br>" +
             "createTime: 操作时间<br>" +
             "checkType：核查类型(0病历，1病案首页,2全部 默认)<br>")

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -51,8 +51,8 @@
             a.beh_dept_id,b.id from med_behospital_info a ,med_check_info b
               where a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id and a.is_deleted = 'N'
                 and b.is_deleted = 'N' and b.job_distribution_name is NULL  and b.`status` = 0
-                <if test="checkType !=null">
-                    and b.job_type = #{checkType}
+                <if test="jobType !=null">
+                    and b.job_type = #{jobType}
                 </if>
                 <if test="startTime !=null and endTime !=null">
                     and b.job_create_time BETWEEN #{startTime} AND #{endTime}