二期诊断量表关联删除修

icssman-service/src/main/java/com/diagbot/dto/GetDeptNameDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/2 11:39
+ */
+@Getter
+@Setter
+public class GetDeptNameDTO {
+    //科室id
+    private Long id;
+    //科室名称
+    private String name;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetDeptInfoDTO;
+import com.diagbot.dto.GetDeptNameDTO;
 import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
@@ -171,7 +172,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      *
      * @return
      */
-    public List<DeptInfo> getAllDeptInfo(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
+    public List<GetDeptNameDTO> getAllDeptInfo(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
         //查询当前类型已经添加过得常用标签所关联的科室
         List<GetQuestionUsualAndTypeDTO> getQuestionUsualAndTypeDTOS = questionUsualFacade.getQuestionUsualByDeptIds(getQuestionUsualAndTypeVO);
         List<Long> deptIds = getQuestionUsualAndTypeDTOS.stream().map(getQuestionUsualAndTypeDTO -> getQuestionUsualAndTypeDTO.getDeptId()).collect(Collectors.toList());
@@ -180,6 +181,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
                 .notIn("id",deptIds);
         List<DeptInfo> deptInfoList = this.list(queryWrapper);
+        List<GetDeptNameDTO> getDeptNameDTOS = BeanUtil.listCopyTo(deptInfoList,GetDeptNameDTO.class);
         /*//查询所有科室
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
@@ -232,7 +234,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
                 deptInfoDTOS.add(deptInfoDTO);
             }
         }*/
-        return deptInfoList;
+        return getDeptNameDTOS;
     }
 
     /**

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

@@ -155,15 +155,16 @@ public class DisScaleFacade extends DisScaleServiceImpl {
      * @return
      */
     public Boolean delDisScaleInfo(DelDisScaleInfoVO delDisScaleInfoVO){
-        UpdateWrapper<DisScale> disScaleUpdateWrapper = new UpdateWrapper<>();
-        if(delDisScaleInfoVO.getDisId() != null){
-            disScaleUpdateWrapper.eq("dis_id",delDisScaleInfoVO.getDisId());
-        }else if (delDisScaleInfoVO.getScaleId() != null){
-            disScaleUpdateWrapper.eq("scale_id",delDisScaleInfoVO.getScaleId());
-        }else {
-            disScaleUpdateWrapper.eq("id",delDisScaleInfoVO.getId());
+        QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
+        disScaleQueryWrapper.eq("id",delDisScaleInfoVO.getId())
+                .eq("is_deleted",IsDeleteEnum.Y.getKey());
+        if(this.count(disScaleQueryWrapper) > 0){
+            throw new CommonException(CommonErrorCode.IS_EXISTS,
+                    "此条关联已删除");
         }
-        disScaleUpdateWrapper.set("is_deleted",IsDeleteEnum.Y.getKey())
+        UpdateWrapper<DisScale> disScaleUpdateWrapper = new UpdateWrapper<>();
+        disScaleUpdateWrapper.eq("id",delDisScaleInfoVO.getId())
+                .set("is_deleted",IsDeleteEnum.Y.getKey())
                 .set("modifier",UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified",DateUtil.now());
         this.update(new DisScale(),disScaleUpdateWrapper);

icssman-service/src/main/java/com/diagbot/vo/DelDisScaleInfoVO.java

@@ -13,8 +13,4 @@ import lombok.Setter;
 public class DelDisScaleInfoVO {
     //诊断关联id
     private Long id;
-    //诊断id
-    private Long disId;
-    //量表id
-    private Long scaleId;
 }

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

@@ -71,8 +71,8 @@ public class DisScaleController {
 
     @ApiOperation(value = "2期-诊断量表关联——删除[by:wangyu]",
             notes = "id: 分页查询主页面的id <br>" +
-                    "disId: 诊断id<br>" +
-                    "scaleId: 量表id<br>")
+                    "<br>" +
+                    "<br>")
     @PostMapping("/delDisScaleInfo")
     @SysLogger("delDisScaleInfo")
     @Transactional

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

@@ -4,9 +4,9 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetDeptInfoDTO;
+import com.diagbot.dto.GetDeptNameDTO;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DeptInfo;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.facade.QuestionUsualFacade;
@@ -76,8 +76,8 @@ public class QuestionUsualController {
             notes = "")
     @PostMapping("/getDeptName")
     @SysLogger("getDeptName")
-    public RespDTO<List<DeptInfo>> getDeptName(@RequestBody GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
-        List<DeptInfo> data = deptInfoFacade.getAllDeptInfo(getQuestionUsualAndTypeVO);
+    public RespDTO<List<GetDeptNameDTO>> getDeptName(@RequestBody GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
+        List<GetDeptNameDTO> data = deptInfoFacade.getAllDeptInfo(getQuestionUsualAndTypeVO);
         return RespDTO.onSuc(data);
     }