代码优化

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

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
@@ -125,17 +124,4 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         }
         return data;
     }
-
-    /**
-     * 根据标签名获取标签信息
-     * @param questionInfo
-     * @return
-     */
-    public QuestionInfo getQuestionInfos(QuestionInfo questionInfo){
-        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<QuestionInfo>();
-        queryWrapper.eq("is_deleted", "N");
-        queryWrapper.eq("type", 1);
-        queryWrapper.eq("name",questionInfo.getName());
-        return this.getOne(queryWrapper);
-    }
 }

icss-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -3,7 +3,6 @@ package com.diagbot.web;
 
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionVO;
@@ -54,16 +53,4 @@ public class QuestionInfoController {
         Map<Long, Object> data = questionFacade.getByIds(questionIdsVO);
         return RespDTO.onSuc(data);
     }
-
-
-    /**
-     * 获取疾病标签信息，远程调用[by:wangyu]
-     * @param questionInfo
-     * @return
-     */
-    @PostMapping("/getQuestionInfos")
-    public RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo){
-        QuestionInfo data = questionFacade.getQuestionInfos(questionInfo);
-        return RespDTO.onSuc(data);
-    }
 }

icssman-service/src/main/java/com/diagbot/client/IcssServiceClient.java

@@ -1,26 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.IcssServiceHystrix;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.vo.DeptInfoVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: wangyu
- * @time: 2018/12/3 17:46
- */
-@FeignClient(value = "icss-service", fallback = IcssServiceHystrix.class)
-public interface IcssServiceClient {
-    @PostMapping("/deptInfo/getDeptInfo")
-    RespDTO<List<DeptInfoDTO>> getDeptInfo(@RequestBody DeptInfoVO deptInfoVO);
-
-    @PostMapping("/questionInfo/getQuestionInfos")
-    RespDTO<QuestionInfo> getQuestionInfos(@RequestBody QuestionInfo questionInfo);
-}

icssman-service/src/main/java/com/diagbot/client/hystrix/IcssServiceHystrix.java

@@ -1,33 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.IcssServiceClient;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.vo.DeptInfoVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * @Description: 调用Icss服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-@Slf4j
-public class IcssServiceHystrix implements IcssServiceClient {
-    @Override
-    public RespDTO<List<DeptInfoDTO>> getDeptInfo(DeptInfoVO deptInfoVO) {
-        log.error("【hystrix】调用{}异常", "getDeptInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<QuestionInfo> getQuestionInfos(QuestionInfo questionInfo) {
-        log.error("【hystrix】调用{}异常", "getQuestionInfos");
-        return null;
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionIndexDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
@@ -78,4 +79,17 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
         paramMap.put("type", questionIndexDTO.getType());
         return this.index(paramMap);
     }
+
+    /**
+     * 根据标签名获取标签信息
+     * @param questionInfo
+     * @return
+     */
+    public QuestionInfo getQuestionInfos(QuestionInfo questionInfo){
+        QueryWrapper<QuestionInfo> queryWrapper = new QueryWrapper<QuestionInfo>();
+        queryWrapper.eq("is_deleted", "N");
+        queryWrapper.eq("type", 1);
+        queryWrapper.eq("name",questionInfo.getName());
+        return this.getOne(queryWrapper);
+    }
 }

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

@@ -45,16 +45,16 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
                     "获取科室信息失败");
         }
         questionInfo.setName(questionUsualVO.getQuestionName());
-        RespDTO<QuestionInfo> questionInfoRespDTO = icssServiceClient.getQuestionInfos(questionInfo);
-        if (questionInfoRespDTO == null || !"0".equals(questionInfoRespDTO.code)) {
+        QuestionInfo questionInfoRespDTO = questionInfoFacade.getQuestionInfos(questionInfo);
+        if (questionInfoRespDTO == null) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取标签信息失败");
         }
         QuestionUsual questionUsual = new QuestionUsual();
         questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
         questionUsual.setGmtCreate(DateUtil.now());
-        questionUsual.setQuestionId(questionInfoRespDTO.data.getId());
-        questionUsual.setDeptId(listRespDTO.data.get(0).getId());
+        questionUsual.setQuestionId(questionInfoRespDTO.getId());
+        questionUsual.setDeptId(listRespDTO.get(0).getId());
         Boolean flag = this.save(questionUsual);
         if(!flag){
             throw new CommonException(CommonErrorCode.FAIL,

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

@@ -2,9 +2,12 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.vo.GetDeptInfoVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室信息表 Mapper 接口
@@ -16,9 +19,17 @@ import com.diagbot.vo.GetDeptInfoVO;
 public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
 
     /**
-     * 获取科室信息
+     * 分页获取科室信息
      * @param getDeptInfoVO
      * @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/mapper/QuestionInfoMapper.java

@@ -19,4 +19,6 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
     public void deleteByIds(Map map);
 
     public List<QuestionInfo> index(Map map);
+
+
 }

icssman-service/src/main/java/com/diagbot/service/impl/DeptInfoServiceImpl.java

@@ -2,12 +2,15 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.mapper.DeptInfoMapper;
 import com.diagbot.service.DeptInfoService;
 import com.diagbot.vo.GetDeptInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室信息表 服务实现类
@@ -23,4 +26,9 @@ public class DeptInfoServiceImpl extends ServiceImpl<DeptInfoMapper, DeptInfo> i
     public IPage<DeptInfo> getAllDeptInfo(GetDeptInfoVO getDeptInfoVO) {
         return baseMapper.getAllDeptInfo(getDeptInfoVO);
     }
+
+    @Override
+    public List<DeptInfoDTO> getDeptInfos(String deptCode, String hospitalCode) {
+        return baseMapper.getDeptInfos(deptCode,hospitalCode);
+    }
 }

icssman-service/src/main/resources/mapper/DeptInfoMapper.xml

@@ -21,4 +21,11 @@
          </if>
         order by id desc
     </select>
+
+    <select id="getDeptInfos" resultType="com.diagbot.dto.DeptInfoDTO">
+        SELECT a.* FROM `icss_dept_info` a
+        LEFT JOIN tran_hospital_dept b ON a.id = b.dept_id
+        WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
+        AND b.`code` = #{deptCode} AND b.hospital_code = #{hospitalCode}
+    </select>
 </mapper>