科室信息维护——删除

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

@@ -1,8 +1,8 @@
 package com.diagbot.facade;
 
-import com.diagbot.client.IcssServiceClient;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
@@ -11,6 +11,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.QuestionUsualVO;
@@ -28,7 +29,9 @@ import java.util.List;
 @Component
 public class QuestionUsualFacade extends QuestionUsualServiceImpl {
     @Autowired
-    private IcssServiceClient icssServiceClient ;
+    private QuestionInfoFacade questionInfoFacade ;
+    @Autowired
+    private DeptInfoFacade deptInfoFacade;
 
     /**
      * 添加常用标签
@@ -39,8 +42,8 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         DeptInfoVO deptInfoVO =new DeptInfoVO();
         QuestionInfo questionInfo =new QuestionInfo();
         BeanUtil.copyProperties(questionUsualVO,deptInfoVO);
-        RespDTO<List<DeptInfoDTO>> listRespDTO = icssServiceClient.getDeptInfo(deptInfoVO);
-        if (listRespDTO == null || !"0".equals(listRespDTO.code)) {
+        List<DeptInfoDTO> listRespDTO = deptInfoFacade.getDeptInfos(questionUsualVO.getDeptCode(),questionUsualVO.getHospitalCode());
+        if (ListUtil.isEmpty(listRespDTO)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取科室信息失败");
         }
@@ -99,4 +102,9 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         }
         return flag;
     }
+
+    public IPage<QuestionUsual> getQuestionUsual(){
+        IPage iPage =new Page();
+       return iPage;
+    }
 }

icssman-service/src/main/java/com/diagbot/mapper/DeptInfoMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.vo.GetDeptInfoVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -31,5 +32,5 @@ public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
      * @param hospitalCode
      * @return
      */
-    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode);
+    public List<DeptInfoDTO> getDeptInfos(@Param("deptCode") String deptCode,@Param("hospitalCode") String hospitalCode);
 }

icssman-service/src/main/java/com/diagbot/service/DeptInfoService.java

@@ -2,9 +2,12 @@ package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.vo.GetDeptInfoVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室信息表 服务类
@@ -21,4 +24,12 @@ public interface DeptInfoService extends IService<DeptInfo> {
      * @return
      */
     public IPage<DeptInfo> getAllDeptInfo(GetDeptInfoVO getDeptInfoVO);
+
+    /**
+     *  获取科室信息
+     * @param deptCode
+     * @param hospitalCode
+     * @return
+     */
+    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode);
 }

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

@@ -1,8 +1,10 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.QuestionUsual;
 import com.diagbot.facade.QuestionUsualFacade;
 import com.diagbot.vo.QuestionUsualVO;
 import com.diagbot.vo.UpdateQuetionUsualVO;
@@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 常用标签表 前端控制器
@@ -39,7 +43,7 @@ public class QuestionUsualController {
     @PostMapping("/addQuestionUsual")
     @SysLogger("addQuestionUsual")
     @Transactional
-    public RespDTO<Boolean> addQuestionUsual(@RequestBody QuestionUsualVO questionUsualVO) {
+    public RespDTO<Boolean> addQuestionUsual(@Valid @RequestBody QuestionUsualVO questionUsualVO) {
         Boolean data = questionUsualFacade.addQuestionUsual(questionUsualVO);
         return RespDTO.onSuc(data);
     }
@@ -51,7 +55,7 @@ public class QuestionUsualController {
     @PostMapping("/updateQuestionUsual")
     @SysLogger("updateQuestionUsual")
     @Transactional
-    public RespDTO<Boolean> updateQuestionUsual(@RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
+    public RespDTO<Boolean> updateQuestionUsual(@Valid @RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
         Boolean data = questionUsualFacade.updateQuestionUsual(updateQuetionUsualVO);
         return RespDTO.onSuc(data);
     }
@@ -61,8 +65,17 @@ public class QuestionUsualController {
     @PostMapping("/deleteQuestionUsual")
     @SysLogger("deleteQuestionUsual")
     @Transactional
-    public RespDTO<Boolean> deleteQuestionUsual(@RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
+    public RespDTO<Boolean> deleteQuestionUsual(@Valid @RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
         Boolean data = questionUsualFacade.deleteQuestionUsual(updateQuetionUsualVO);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "常用标签维护——查询[by:wangyu]",
+            notes = "id: 常用标签id,必填<br>")
+    @PostMapping("/getQuestionUsual")
+    @SysLogger("getQuestionUsual")
+    public RespDTO<IPage<QuestionUsual>> getQuestionUsual() {
+        IPage<QuestionUsual> data = questionUsualFacade.getQuestionUsual();
+        return RespDTO.onSuc(data);
+    }
 }