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

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

@@ -40,33 +40,33 @@ public class MedCheckWorkFacade extends MedCheckWorkServiceImpl {
      * @Author songxl
      * @Description 批量插入任务
      * @Date 2021/5/11
-     * @Param [medCheckWorkVOList]
+     * @Param [medCheckWorkVO]
      * @Return java.lang.Boolean
      * @MethodName addCheck
      */
-    public Boolean addCheck(ArrayList<MedCheckWorkAddVO> medCheckWorkVOList) {
-
-        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
-        String create = SysUserUtils.getCurrentPrincipleID();
-        List<MedCheckWork> checkWorkList = new ArrayList<>();
-        for (MedCheckWorkAddVO medCheckWorkAddVO : medCheckWorkVOList) {
-            //入参验证
-            if (StringUtil.isBlank(medCheckWorkAddVO.getBehospitalCode())
-                    || StringUtil.isBlank(medCheckWorkAddVO.getWorkType())) {
-                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "病历id或任务类型不能为空！");
-            }
-            MedCheckWork medCheckWork = new MedCheckWork();
-            medCheckWork.setHospitalId(hospitalId);
-            medCheckWork.setCreator(create);
-            medCheckWork.setGmtCreate(DateUtil.now());
-            medCheckWork.setBehospitalCode(medCheckWorkAddVO.getBehospitalCode());
-            medCheckWork.setWorkType(medCheckWorkAddVO.getWorkType());
-
-            medCheckWork.setId(Long.valueOf(medCheckWorkAddVO.getBehospitalCode()));
-            checkWorkList.add(medCheckWork);
-        }
-        return medCheckWorkServiceImpl.saveBatch(checkWorkList, 10);
-    }
+//    public Boolean addCheck(MedCheckWorkAddVO medCheckWorkVO) {
+
+//        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+//        String create = SysUserUtils.getCurrentPrincipleID();
+//        List<MedCheckWork> checkWorkList = new ArrayList<>();
+//        for (MedCheckWorkAddVO medCheckWorkAddVO : medCheckWorkVO) {
+//            //入参验证
+//            if (StringUtil.isBlank(medCheckWorkAddVO.getBehospitalCode())
+//                    || StringUtil.isBlank(medCheckWorkAddVO.getWorkType())) {
+//                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "病历id或任务类型不能为空！");
+//            }
+//            MedCheckWork medCheckWork = new MedCheckWork();
+//            medCheckWork.setHospitalId(hospitalId);
+//            medCheckWork.setCreator(create);
+//            medCheckWork.setGmtCreate(DateUtil.now());
+//            medCheckWork.setBehospitalCode(medCheckWorkAddVO.getBehospitalCode());
+//            medCheckWork.setWorkType(medCheckWorkAddVO.getWorkType());
+//
+//            medCheckWork.setId(Long.valueOf(medCheckWorkAddVO.getBehospitalCode()));
+//            checkWorkList.add(medCheckWork);
+//        }
+//        return medCheckWorkServiceImpl.saveBatch(checkWorkList, 10);
+//    }
 
     /**
      * @Author songxl

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

@@ -3,7 +3,10 @@ package com.diagbot.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author songxl
@@ -15,10 +18,12 @@ import java.util.Date;
 @Setter
 public class MedCheckWorkAddVO {
     @ApiModelProperty(hidden = true)
-    private Long hospitalId;//医院id
-    private String behospitalCode; // 病历id
+    private Long hospitalId;            //医院id
+    private List<String> behospitalCodeList = new ArrayList<>(); // 病历id
     @ApiModelProperty(hidden = true)
-    private String creator; // 创建用户
-    private String workType; // 任务类型 0-科室任务 1-院级 1-质控科
-
+    private String workCreator;         // 创建用户编号
+    private Integer workType;           // 任务类型 0-科室任务 1-院级 1-质控科
+    private Integer checkType;          // 添加或取消0-取消，1-添加
+    private String createTime;          // 操作时间
+    private String checkStatus;         // 核查类型 （0病历，1病案首页,2全部 默认）
 }

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

@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-
 /**
  * <p>
  *  核查前端控制器
@@ -34,14 +32,14 @@ public class MedCheckWorkController {
     @Autowired
     MedCheckWorkFacade medCheckworkFacade;
 
-    @ApiOperation(value = "生成核查任务[by:songxl]",
-            notes = "生成核查任务")
-    @PostMapping("/addCheck")
-    @SysLogger("addCheck")
-    public RespDTO<Boolean> addMedCheckInfo(@RequestBody ArrayList<MedCheckWorkAddVO> medCheckWorkVOList) {
-        Boolean res = medCheckworkFacade.addCheck(medCheckWorkVOList);
-        return RespDTO.onSuc(res);
-    }
+//    @ApiOperation(value = "生成核查任务[by:songxl]",
+//            notes = "生成核查任务")
+//    @PostMapping("/addCheck")
+//    @SysLogger("addCheck")
+//    public RespDTO<Boolean> addMedCheckInfo(@RequestBody MedCheckWorkAddVO medCheckWorkVO) {
+//        Boolean res = medCheckworkFacade.addCheck(medCheckWorkVO);
+//        return RespDTO.onSuc(res);
+//    }
 
     @ApiOperation(value = "核查任务列表[by:wangsy]",
             notes = "startDate：出院开始时间<br>" +