代码优化

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -72,18 +72,16 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         deptVitalQueryWrapper.eq("dept_id", deptVitalVO.getDeptId()).
                 eq("is_deleted", IsDeleteEnum.N.getKey());
         if (this.count(deptVitalQueryWrapper) > 0) {
-            throw new CommonException(CommonErrorCode.IS_EXISTS, "该科室模板已经存在！");
+            //先删除该科室原有模板
+            UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
+            deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
+                    eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    set("is_deleted", IsDeleteEnum.Y.getKey()).
+                    set("modifier", UserUtils.getCurrentPrincipleID()).
+                    set("gmt_modified", DateUtil.now());
+            this.update(new DeptVital(), deptVitalUpdateWrapper);
         }
 
-        //先删除该科室原有模板
-        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
-        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                eq("is_deleted", IsDeleteEnum.N.getKey()).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("modifier", UserUtils.getCurrentPrincipleID()).
-                set("gmt_modified", DateUtil.now());
-        this.update(new DeptVital(), deptVitalUpdateWrapper);
-
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         List<Long> vitalIds = deptVitalVO.getDvDetailVOList().stream().map(deDetailVO -> deDetailVO.getVitalId()).collect(Collectors.toList());
@@ -120,25 +118,6 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         return true;
     }
 
-    /**
-     * 删除科室查体模板标签
-     *
-     * @param deptVitalVO
-     * @return
-     */
-    public Boolean delDeptVitalList(DeptVitalVO deptVitalVO) {
-        UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
-        List<Long> vitalIds = deptVitalVO.getDvDetailVOList().stream().map(deDetailVO -> deDetailVO.getVitalId()).collect(Collectors.toList());
-        deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                in("vital_id", vitalIds).
-                eq("is_deleted", IsDeleteEnum.N.getKey()).
-                set("is_deleted", IsDeleteEnum.Y.getKey()).
-                set("modifier", UserUtils.getCurrentPrincipleID()).
-                set("gmt_modified", DateUtil.now());
-        this.update(new DeptVital(), deptVitalUpdateWrapper);
-        return true;
-    }
-
     /**
      * 删除科室查体模板标签-全删除
      *

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -54,18 +54,6 @@ public class DeptVitalController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "删除模板标签-部分删除[by:zhaops]",
-            notes = "deptId:科室ID，必填<br>" +
-                    "vitalIds:查体标签ids，必填<br>")
-    @PostMapping("/delDeptVitalList")
-    @SysLogger("delDeptVitalList")
-    @Transactional
-    @ApiIgnore
-    public RespDTO<Boolean> delDeptVitalList(@RequestBody DeptVitalVO deptVitalVO) {
-        Boolean data = deptVitalFacade.delDeptVitalList(deptVitalVO);
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "删除模板标签-全删除[by:zhaops]",
             notes = "deptId:科室ID，必填<br>")
     @PostMapping("/delAllDeptVitalList")