将取得功能清单的代码移动到公共区域

common-biz-client/pom.xml

@@ -64,6 +64,14 @@
             <version>5.2.1.RELEASE</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- 私有仓库 -->

common-biz-client/src/main/java/com/diagbot/client/TranCommonServiceClient.java

@@ -1,13 +1,16 @@
 package com.diagbot.client;
 
 import com.diagbot.client.hystrix.TranCommonServiceHystrix;
+import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.HosPermissionDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.HospitalFunctionVO;
 import com.diagbot.vo.PermissionVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -21,181 +24,6 @@ public interface TranCommonServiceClient {
     @PostMapping(value = "/hospitalRole/getAllPermission")
     RespDTO<List<HosPermissionDTO>> getAllPermission(@RequestBody PermissionVO permissionVO);
 
-    /**
-     * 获取医生信息
-     *
-     * @param doctorInfoVo
-     * @return
-     *//*
-    @PostMapping("/doctorInfo/getDoctorInfo")
-    RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo);
-
-    *//**
-     * 根据ids获取医生信息map
-     *
-     * @param ids
-     * @return
-     *//*
-    @PostMapping("/doctorInfo/doctorInfoMapByIds")
-    RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(@RequestBody List<Long> ids);
-
-    *//**
-     * 根据id获取医生信息
-     *
-     * @param id
-     * @return
-     *//*
-    @PostMapping("/doctorInfo/doctorInfoById")
-    RespDTO<DoctorInfoDTO> getDoctorInfoById(@RequestBody Long id);
-
-    *//**
-     * 根据ids获取科室信息map
-     *
-     * @param ids
-     * @return
-     *//*
-    @PostMapping("/hospitalDeptInfo/hospitalDeptInfoMapByIds")
-    RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(@RequestBody List<Long> ids);
-
-    *//**
-     * 获取医院信息
-     *
-     * @param hospitalInfoVO
-     * @return
-     *//*
-    @PostMapping("/hospitalInfo/getHospitalInfo")
-    RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody HospitalInfoVO hospitalInfoVO);
-
-    *//**
-     * 匹配公表名
-     *
-     * @param lisHospitalCodeVO
-     * @return
-     *//*
-    @PostMapping("/tranLisConfig/getLisConfigByhospitalId")
-    RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(@RequestBody LisHospitalCodeVO lisHospitalCodeVO);
-
-    *//**
-     * 获取患者信息
-     *
-     * @param patientInfoVO
-     * @return
-     *//*
-    @PostMapping("/patientInfo/getPatientInfo")
-    RespDTO<PatientInfoDTO> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO);
-
-    *//**
-     * 根据ids获取病人信息
-     *
-     * @param ids
-     * @return
-     *//*
-    @PostMapping("/patientInfo/patientInfoMapByIds")
-    RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(@RequestBody List<Long> ids);
-
-    *//**
-     * 根据uuid获取相关信息
-     *
-     * @param tranFieldInfoVO
-     * @return
-     *//*
-    @PostMapping("/tranFieldInfo/getInfoByUuid")
-    RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@RequestBody TranFieldInfoVO tranFieldInfoVO);
-
-    *//**
-     * 将问诊记录保存一份至对接层
-     *
-     * @param saveInquiryToHisVO
-     * @return
-     *//*
-    @PostMapping("/inquiryInfo/saveInquiryToHis")
-    RespDTO<Boolean> saveInquiryToHis(@RequestBody SaveInquiryToHisVO saveInquiryToHisVO);
-
-    *//**
-     * 急诊-历史病历列表
-     *
-     * @param hisInquirysForJzVO
-     * @return
-     *//*
-    @PostMapping("/inquiryInfo/hisInquirysForJz")
-    RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO);
-
-    *//**
-     * 急诊-添加二次诊断
-     *
-     * @param addDiagnoseSecondVO
-     * @return
-     *//*
-    @PostMapping("/inquiryInfo/addDiagnoseSecond")
-    RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO);
-
-    *//**
-     * 急诊-获取需要导出的问诊数据
-     *
-     * @param inquiryIds
-     * @return
-     *//*
-    @PostMapping("/inquiryInfo/getExportInquirys")
-    RespDTO<List<GetExportInquirysDTO>> getExportInquirys(@RequestBody List<Long> inquiryIds);
-
-    *//**
-     * 根据医院编码获取辅检公表映射关系
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @PostMapping("/pacsConfig/getPacsConfigByHosCode")
-    RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO);
-
-    *//**
-     * 根据医院编码获取提示信息标题映射关系
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @PostMapping("/introduceTitleConfig/getTitleMappingHosCode")
-    RespDTO<Map<String, String>> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO);
-
-    *//**
-     * 根据医院编码查询诊断icd映射
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @PostMapping("/diseaseIcd/getDiseaseIcdByHosCode")
-    RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO);
-
-    *//**
-     * 根据医院编码查询辅检公表映射，公表项做key
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @PostMapping("/pacsConfig/getPacsConfigByUniqueNameAndHosCode")
-    RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
-
-    @PostMapping("/lisDockingImports/lisDockingImports")
-    public RespDTO<LisRetrieveListAllDTO> getLisDatas(@RequestBody @Valid LisArgumentsVO lisArgumentsVO);
-
-    @PostMapping("/lisDockingImports/getByGroupNameLisData")
-    public RespDTO<LisDataDTO> getByGroupNameLisData(@RequestBody @Valid LisGroupNameVO lisGroupNameVO);
-
-    @PostMapping("/lisDockingImports/pacsDockingImport")
-    RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO);
-
-    @PostMapping("/lisDockingImports/getByCheckItemPacsData")
-    RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO);
-
-    @PostMapping("/sysSet/getSysSetInfoDatas")
-    RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
-
-    @PostMapping("/sysSet/getHospitalRankInfo")
-    RespDTO<GetHospitalRankInfoDTO> getHospitalRankInfo(@RequestBody GetHospitalRankInfoVO getHospitalRankInfoVO);
-
-    @PostMapping("/sysSet/getAdminCheckout")
-    RespDTO<Boolean> getAdminCheckout(@Valid @RequestBody HospitalCodeSetVO hospitalCodeSetVO);
-
-    @PostMapping("/hospitalDeptInfo/getHospitalDeptInfoAll")
-    RespDTO<List<HospitalDeptInfoAllDTO>> getHospitalDeptInfoAll(@RequestBody @Valid HospitalCodeVo hospitalCodeVo);*/
-
+    @PostMapping("/function/getFunctionDatas")
+    RespDTO<List<FunctionDTO>> getFunctionDatas(@Valid @RequestBody HospitalFunctionVO hospitalFunctionVO);
 }

common-biz-client/src/main/java/com/diagbot/client/hystrix/TranCommonServiceHystrix.java

@@ -1,13 +1,16 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.TranCommonServiceClient;
+import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.HosPermissionDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.HospitalFunctionVO;
 import com.diagbot.vo.PermissionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -25,183 +28,9 @@ public class TranCommonServiceHystrix implements TranCommonServiceClient {
         return null;
     }
 
-   /* @Override
-    public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@Valid DoctorInfoVO doctorInfoVo) {
-        log.error("【hystrix】调用{}异常", "getDoctorInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(List<Long> ids) {
-        log.error("【hystrix】调用{}异常", "doctorInfoMapByIds");
-        return null;
-    }
-
-    *//**
-     * 根据id获取医生信息
-     *
-     * @param id
-     * @return
-     *//*
-    @Override
-    public RespDTO<DoctorInfoDTO> getDoctorInfoById(@RequestBody Long id) {
-        log.error("【hystrix】调用{}异常", "getDoctorInfoById");
-        return null;
-    }
-
-    @Override
-    public RespDTO<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
-        log.error("【hystrix】调用{}异常", "getHospitalInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(List<Long> ids) {
-        log.error("【hystrix】调用{}异常", "hospitalDeptInfoMapByIds");
-        return null;
-    }
-
-    @Override
-    public RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(LisHospitalCodeVO lisHospitalCodeVO) {
-        log.error("【hystrix】调用{}异常", "getLisConfigByhospitalId");
-        return null;
-    }
-
-    @Override
-    public RespDTO<PatientInfoDTO> getPatientInfo(PatientInfoVO patientInfoVO) {
-        log.error("【hystrix】调用{}异常", "getPatientInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(List<Long> ids) {
-        log.error("【hystrix】调用{}异常", "patientInfoMapByIds");
-        return null;
-    }
-
-    @Override
-    public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(TranFieldInfoVO tranFieldInfoVO) {
-        log.error("【hystrix】调用{}异常", "getInfoByUuid");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Boolean> saveInquiryToHis(SaveInquiryToHisVO saveInquiryToHisVO) {
-        log.error("【hystrix】调用{}异常", "saveInquiryToHis");
-        return null;
-    }
-
-    @Override
-    public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
-        log.error("【hystrix】调用{}异常", "hisInquirysForJz");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Boolean> addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO) {
-        log.error("【hystrix】调用{}异常", "addDiagnoseSecond");
-        return null;
-    }
-
     @Override
-    public RespDTO<List<GetExportInquirysDTO>> getExportInquirys(List<Long> inquiryIds) {
-        log.error("【hystrix】调用{}异常", "getExportInquirys");
+    public RespDTO<List<FunctionDTO>> getFunctionDatas(@Valid HospitalFunctionVO hospitalFunctionVO) {
+        log.error("【hystrix】调用{}异常", "getFunctionDatas");
         return null;
     }
-
-    *//**
-     * 根据医院编码获取辅检公表映射关系
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @Override
-    public RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO) {
-        log.error("【hystrix】调用{}异常", "getPacsConfigByHosCode");
-        return null;
-    }
-
-    *//**
-     * 根据医院编码获取提示信息标题映射关系
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @Override
-    public RespDTO<Map<String, String>> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO) {
-        log.error("【hystrix】调用{}异常", "getTitleMappingHosCode");
-        return null;
-    }
-
-    *//**
-     * 根据医院编码查询诊断icd映射
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @Override
-    public RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO) {
-        log.error("【hystrix】调用{}异常", "getDiseaseIcdByHosCode");
-        return null;
-    }
-
-    *//**
-     * 根据医院编码查询辅检公表映射，公表项做key
-     *
-     * @param hosCodeVO
-     * @return
-     *//*
-    @Override
-    public RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO) {
-        log.error("【hystrix】调用{}异常", "getPacsConfigByUniqueNameAndHosCode");
-        return null;
-    }
-
-    @Override
-    public RespDTO<LisRetrieveListAllDTO> getLisDatas(@RequestBody @Valid LisArgumentsVO lisArgumentsVO) {
-        log.error("【hystrix】调用{}异常", "getLisDatas");
-        return null;
-    }
-
-    @Override
-    public RespDTO<LisDataDTO> getByGroupNameLisData(@RequestBody @Valid LisGroupNameVO lisGroupNameVO) {
-        log.error("【hystrix】调用{}异常", "getByGroupNameLisData");
-        return null;
-    }
-
-    @Override
-    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(@RequestBody @Valid PacsArgumentsVO pacsArgumentsVO) {
-        log.error("【hystrix】调用{}异常", "pacsDockingImports");
-        return null;
-    }
-
-    @Override
-    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(@RequestBody @Valid PacsCheckItemVO pacsGroupNameVO) {
-        log.error("【hystrix】调用{}异常", "getByCheckItemPacsDatas");
-        return null;
-    }
-
-    @Override
-    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
-        log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
-        return null;
-    }
-
-    @Override
-    public RespDTO<GetHospitalRankInfoDTO> getHospitalRankInfo(GetHospitalRankInfoVO getHospitalRankInfoVO) {
-        log.error("【hystrix】调用{}异常", "getHospitalRankInfo");
-        return null;
-    }
-
-    @Override
-    public RespDTO<Boolean> getAdminCheckout(@Valid HospitalCodeSetVO hospitalCodeSetVO) {
-        log.error("【hystrix】调用{}异常", "getAdminCheckout");
-        return null;
-    }
-
-    @Override
-    public RespDTO<List<HospitalDeptInfoAllDTO>> getHospitalDeptInfoAll(@Valid HospitalCodeVo hospitalCodeVo) {
-        log.error("【hystrix】调用{}异常", "getHospitalDeptInfoAll");
-        return null;
-    }*/
 }

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

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.client.TranServiceClient;
+import com.diagbot.client.TranCommonServiceClient;
 import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
@@ -14,11 +14,11 @@ import java.util.List;
 public class FunctionFacade {
 
     @Autowired
-    TranServiceClient tranServiceClient;
+    private TranCommonServiceClient tranCommonServiceClient;
 
     public List<FunctionDTO> getFunctionData(HospitalFunctionVO hospitalFunctionVO) {
-        RespDTO<List<FunctionDTO>> functionDTOList = tranServiceClient.getFunctionDatas(hospitalFunctionVO);
-        RespDTOUtil.respNGDeal(functionDTOList, "获取配置数据失败！");
+        RespDTO<List<FunctionDTO>> functionDTOList = tranCommonServiceClient.getFunctionDatas(hospitalFunctionVO);
+        RespDTOUtil.respNGDeal(functionDTOList, "获取功能清单数据失败！");
         return functionDTOList.data;
     }
 }

icss-service/src/main/java/com/diagbot/vo/HospitalFunctionVO.java

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import com.diagbot.enums.SysTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -20,5 +19,5 @@ public class HospitalFunctionVO {
      * (14, "tran-service"),(15, "aipt-service"),(16, "data-service"),(17, "prec-service");
      */
     @ApiModelProperty(hidden = true)
-    private Integer sysType = SysTypeEnum.ICSS_SERVICE.getKey();
+    private Integer sysType;
 }

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -2,7 +2,6 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.GetExportInquirysDTO;
 import com.diagbot.dto.GetHospitalRankInfoDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
@@ -27,7 +26,6 @@ import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalCodeSetVO;
 import com.diagbot.vo.HospitalCodeVo;
-import com.diagbot.vo.HospitalFunctionVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.LisArgumentsVO;
@@ -231,7 +229,4 @@ public interface TranServiceClient {
     @PostMapping("/hospitalDeptInfo/getHospitalDeptInfoAll")
     RespDTO<List<HospitalDeptInfoAllDTO>> getHospitalDeptInfoAll(@RequestBody @Valid HospitalCodeVo hospitalCodeVo);
 
-    @PostMapping("/function/getFunctionDatas")
-    public RespDTO<List<FunctionDTO>> getFunctionDatas(@Valid @RequestBody HospitalFunctionVO hospitalFunctionVO);
-
 }

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -2,7 +2,6 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
-import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.GetExportInquirysDTO;
 import com.diagbot.dto.GetHospitalRankInfoDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
@@ -27,7 +26,6 @@ import com.diagbot.vo.HisInquirysForJzVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalCodeSetVO;
 import com.diagbot.vo.HospitalCodeVo;
-import com.diagbot.vo.HospitalFunctionVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.LisArgumentsVO;
@@ -233,10 +231,4 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfoAll");
         return null;
     }
-
-    @Override
-    public RespDTO<List<FunctionDTO>> getFunctionDatas(@Valid HospitalFunctionVO hospitalFunctionVO) {
-        log.error("【hystrix】调用{}异常", "getFunctionDatas");
-        return null;
-    }
 }

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

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.FunctionDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.facade.FunctionFacade;
 import com.diagbot.vo.HospitalFunctionVO;
 import io.swagger.annotations.Api;
@@ -38,6 +39,7 @@ public class FunctionController {
     @PostMapping("/getFunctionDatas")
     @SysLogger("getFunctionDatas")
     public RespDTO<List<FunctionDTO>> getFunctionDatas(@Valid @RequestBody HospitalFunctionVO hospitalFunctionVO) {
+        hospitalFunctionVO.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
         List<FunctionDTO> data = functionFacade.getFunctionData(hospitalFunctionVO);
         return RespDTO.onSuc(data);
     }