Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

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

@@ -18,6 +18,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDisScaleInfoVO;
+import com.diagbot.vo.DelDisScaleInfoVO;
 import com.diagbot.vo.GetDisScaleAllInfoVO;
 import com.diagbot.vo.GetDisScaleByDisIdVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,4 +147,26 @@ public class DisScaleFacade extends DisScaleServiceImpl {
         }
         return getDisScaleAllInfoDTOS;
     }
+
+    /**
+     * 删除诊断关联量表信息
+     *
+     * @param delDisScaleInfoVO
+     * @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());
+        }
+        disScaleUpdateWrapper.set("is_deleted",IsDeleteEnum.Y.getKey())
+                .set("modifier",UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified",DateUtil.now());
+        this.update(new DisScale(),disScaleUpdateWrapper);
+        return true;
+    }
 }

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

@@ -38,6 +38,7 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DelDisScaleInfoVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
@@ -97,7 +98,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     RetrievalMappingFacade retrievalMappingFacade;
     @Autowired
     DisTypeFacade disTypeFacade;
-
+    @Autowired
+    DisScaleFacade disScaleFacade;
 
     /**
      * 标签保存
@@ -507,6 +509,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                     .set("is_deleted", IsDeleteEnum.Y.getKey()));
 
             //如果是诊断，删除映射关系
+            DelDisScaleInfoVO delDisScaleInfoVO = new DelDisScaleInfoVO();
             if (deleteQuestionVO.getType() == QuestionTypeEnum.Disease.getKey()) {
                 disTypeFacade.update(new DisType(), new UpdateWrapper<DisType>()
                         .eq("dis_id", id)
@@ -514,9 +517,16 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
                         .set("gmt_modified", now)
                         .set("modifier", person)
                         .set("is_deleted", IsDeleteEnum.Y.getKey()));
+                delDisScaleInfoVO = new DelDisScaleInfoVO();
+                delDisScaleInfoVO.setDisId(Long.parseLong(id));
+                disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
+            }
+            //如果是量表，删除量表内容，并删除诊断和量表的关联
+            if(deleteQuestionVO.getType() == QuestionTypeEnum.Scale.getKey()){
+                delDisScaleInfoVO = new DelDisScaleInfoVO();
+                delDisScaleInfoVO.setScaleId(Long.parseLong(id));
+                disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
             }
-            //TODO 如果是量表，删除量表内容，并删除诊断和量表的关联
-
 
             //TODO 删除映射关系或检查抛异常
 

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/2 9:41
+ */
+@Getter
+@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

@@ -7,6 +7,7 @@ import com.diagbot.dto.GetDisScaleAllInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisScaleFacade;
 import com.diagbot.vo.AddDisScaleInfoVO;
+import com.diagbot.vo.DelDisScaleInfoVO;
 import com.diagbot.vo.GetDisScaleAllInfoVO;
 import com.diagbot.vo.GetDisScaleByDisIdVO;
 import io.swagger.annotations.Api;
@@ -49,7 +50,7 @@ public class DisScaleController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "【二期】诊断量表关联——分页获取关联信息[by:wangyu]",
+    @ApiOperation(value = "2期-诊断量表关联——分页获取关联信息[by:wangyu]",
             notes = "disName: 诊断名称<br>" +
                     "scaleName: 量表名称<br>")
     @PostMapping("/getDisScaleAllInfo")
@@ -59,7 +60,7 @@ public class DisScaleController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "【二期】诊断量表关联——根据诊断id获取诊断量表关联信息(修改回读用)[by:wangyu]",
+    @ApiOperation(value = "2期-诊断量表关联——根据诊断id获取诊断量表关联信息(修改回读用)[by:wangyu]",
             notes = "disId: 诊断id,必填<br>")
     @PostMapping("/getDisScaleByDisId")
     @SysLogger("getDisScaleByDisId")
@@ -67,4 +68,16 @@ public class DisScaleController {
         List<GetDisScaleAllInfoDTO> data = disScaleFacade.getDisScaleByDisId(getDisScaleByDisIdVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "2期-诊断量表关联——删除[by:wangyu]",
+            notes = "id: 分页查询主页面的id <br>" +
+                    "disId: 诊断id<br>" +
+                    "scaleId: 量表id<br>")
+    @PostMapping("/delDisScaleInfo")
+    @SysLogger("delDisScaleInfo")
+    @Transactional
+    public RespDTO<Boolean> delDisScaleInfo(@RequestBody @Valid DelDisScaleInfoVO delDisScaleInfoVO){
+        Boolean data = disScaleFacade.delDisScaleInfo(delDisScaleInfoVO);
+        return RespDTO.onSuc(data);
+    }
 }