病历接口修改

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

@@ -1,5 +1,12 @@
 package com.diagbot.client;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
@@ -9,6 +16,9 @@ import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.entity.DoctorInfo;
+import com.diagbot.entity.HospitalDept;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
@@ -16,11 +26,6 @@ import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.LisHospitalCodeVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.TranFieldInfoVO;
-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: 调用信息对接层服务
@@ -38,6 +43,14 @@ public interface TranServiceClient {
      */
     @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);
 
     /**
      * 获取科室信息
@@ -47,6 +60,14 @@ public interface TranServiceClient {
      */
     @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
     RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
+    
+    /**
+     * 根据ids获取科室信息map
+     * @param ids
+     * @return
+     */
+    @PostMapping("/hospitalDeptInfo/hospitalDeptInfoMapByIds")
+    RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(@RequestBody List<Long> ids);
 
     /**
      * 获取医院信息
@@ -81,7 +102,14 @@ public interface TranServiceClient {
      */
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
-
+    
+    /**
+     * 根据ids获取病人信息
+     * @param ids
+     * @return
+     */
+    @PostMapping("/patientInfo/patientInfoMapByIds")
+    RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(@RequestBody List<Long> ids);
 
     /**
      * 根据uuid获取相关信息

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

@@ -9,6 +9,9 @@ import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.entity.DoctorInfo;
+import com.diagbot.entity.HospitalDept;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
@@ -22,6 +25,7 @@ import org.springframework.stereotype.Component;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 调用信息对接层服务
@@ -38,6 +42,12 @@ public class TranServiceHystrix implements TranServiceClient {
     }
 
     @Override
+	public RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(List<Long> ids) {
+    	log.error("【hystrix】调用{}异常", "doctorInfoMapByIds");
+		return null;
+	}
+
+	@Override
     public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         log.error("【hystrix】调用{}异常", "getHospitalInfo");
         return null;
@@ -48,8 +58,14 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
         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;
@@ -66,8 +82,14 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
         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;

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

@@ -1,16 +1,19 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DoctorInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DoctorInfoServiceImpl;
 import com.diagbot.vo.DoctorInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description:
@@ -36,4 +39,20 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
         }
         return doctorInfoDTOList.data;
     }
+    
+    /**
+     * 根据ids获取医生信息map
+     * @param ids 医生ids
+     * @return 医生信息
+     */
+    public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
+    	 RespDTO<Map<Long, DoctorInfo>> retData = tranServiceClient.doctorInfoMapByIds(ids);
+         if (retData == null
+                 || !CommonErrorCode.OK.getCode().equals(retData.code)) {
+             throw new CommonException(CommonErrorCode.RPC_ERROR,
+                     "获取医生信息失败");
+         }
+         return retData.data;
+    }
+    
 }

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

@@ -1,8 +1,18 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.HospitalDeptServiceImpl;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HospitalDept;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.HospitalDeptServiceImpl;
+
 /**
  * @author rgb
  * @Description
@@ -10,5 +20,23 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class HospitalDeptFacade extends HospitalDeptServiceImpl {
+	
+	@Autowired
+    private TranServiceClient tranServiceClient;
+	
+	/**
+     * 根据ids获取科室信息map
+     * @param ids 科室ids
+     * @return 科室信息
+     */
+    public Map<Long, HospitalDept> hospitalDeptInfoMapByIds(List<Long> ids) {
+    	 RespDTO<Map<Long, HospitalDept>> retData = tranServiceClient.hospitalDeptInfoMapByIds(ids);
+         if (retData == null
+                 || !CommonErrorCode.OK.getCode().equals(retData.code)) {
+             throw new CommonException(CommonErrorCode.RPC_ERROR,
+                     "获取科室信息失败");
+         }
+         return retData.data;
+    }
 
 }

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

@@ -1,20 +1,17 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.HospitalInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description:
@@ -49,12 +46,17 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      * @param code 医院编码
      * @return
      */
-    public HospitalInfo getHospitalByCode(String code) {
-        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("code", code);
-        queryWrapper.eq("status", StatusEnum.Enable.getKey());
-        return this.getOne(queryWrapper);
+    public HospitalInfoDTO getHospitalByCode(String code) {
+    	HospitalInfoVO hospitalInfoVO = new HospitalInfoVO();
+    	hospitalInfoVO.setCode(code);
+    	RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
+        if (hospitalInfoDTOList == null
+                || !CommonErrorCode.OK.getCode().equals(hospitalInfoDTOList.code)
+                ||hospitalInfoDTOList.data.size()!=1) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取医院信息失败");
+        }
+        return hospitalInfoDTOList.data.get(0);
     }
 
 }

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

@@ -16,11 +16,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
-import com.diagbot.entity.HospitalInfo;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.PatientInfo;
@@ -32,6 +33,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysVO;
+import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
@@ -55,7 +57,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Autowired
     private HospitalDeptFacade hospitalDeptFacade;
 
-
     /**
      * 问诊记录保存
      *
@@ -157,12 +158,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     public GetLastOtherDTO getLastOther(GetLastOtherVO getLastOtherVO) {
     	GetLastOtherDTO getLastOtherDTO = new GetLastOtherDTO();
     	
-        HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(getLastOtherVO.getHospitalCode());
-        PatientInfo patientInfo = patientInfoFacade.getPatientByCode(getLastOtherVO.getHospitalCode(), getLastOtherVO.getPatientCode());
+    	HospitalInfoDTO hospitalInfoDTO = hospitalInfoFacade.getHospitalByCode(getLastOtherVO.getHospitalCode());
+    	
+    	PatientInfoVO patientInfoVO = new PatientInfoVO();
+    	patientInfoVO.setHospitalCode(getLastOtherVO.getHospitalCode());
+    	patientInfoVO.setPatientCode(getLastOtherVO.getPatientCode());
+    	PatientInfoDTO patientInfoDTO = patientInfoFacade.getPatientInfo(patientInfoVO);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("hospitalId", hospitalInfo.getId());
-        map.put("patientId", patientInfo.getId());
+        map.put("hospitalId", hospitalInfoDTO.getId());
+        map.put("patientId", patientInfoDTO.getId());
         map.put("sign", getLastOtherVO.getSign());
         InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
 
@@ -226,9 +231,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         List<Long> patientIdList = inquiryInfoList.stream().map(i -> i.getPatientId()).collect(Collectors.toList());
         List<Long> inquiryIdList = inquiryInfoList.stream().map(i -> i.getId()).collect(Collectors.toList());
 
-        Map<Long, HospitalDept> hospitalDeptMap = hospitalDeptFacade.listByIds(hospitalDeptIdList).stream().filter(i -> i.getIsDeleted().equals("N") && i.getStatus() == 1).collect(Collectors.toMap(HospitalDept::getId, i -> i));
-        Map<Long, DoctorInfo> doctorInfoMap = doctorInfoFacade.listByIds(doctorIdList).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i -> i));
-        Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.listByIds(patientIdList).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i -> i));
+        Map<Long, HospitalDept> hospitalDeptMap = hospitalDeptFacade.hospitalDeptInfoMapByIds(hospitalDeptIdList);
+        Map<Long, DoctorInfo> doctorInfoMap = doctorInfoFacade.doctorInfoMapByIds(doctorIdList);
+        Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
         Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
 
         List<HisInquiryDTO> hisInquiryDTOList = new ArrayList<>();

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

@@ -1,5 +1,12 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetTopPatientInfoDTO;
@@ -14,9 +21,6 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description: 患者业务逻辑
@@ -82,20 +86,20 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         }
         return getTopPatientInfoDTO;
     }
-
+    
     /**
-     * 通过医院编码、病人编码获取病人信息
-     *
-     * @param hospitalCode 医院编码
-     * @param patientCode  病人编码
-     * @return
+     * 根据ids获取病人信息
+     * @param ids 病人ids
+     * @return 病人信息
      */
-    public PatientInfo getPatientByCode(String hospitalCode, String patientCode) {
-        QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("hospital_code", hospitalCode);
-        queryWrapper.eq("code", patientCode);
-        return this.getOne(queryWrapper);
+    public Map<Long, PatientInfo> patientInfoMapByIds(List<Long> ids) {
+    	 RespDTO<Map<Long, PatientInfo>> retData = tranServiceClient.patientInfoMapByIds(ids);
+         if (retData == null
+                 || !CommonErrorCode.OK.getCode().equals(retData.code)) {
+             throw new CommonException(CommonErrorCode.RPC_ERROR,
+                     "获取患者信息失败");
+         }
+         return retData.data;
     }
 
 }

tran-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java

@@ -1,11 +1,15 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
 import com.diagbot.dto.DoctorInfoDTO;
+import com.diagbot.entity.DoctorInfo;
 import com.diagbot.service.impl.DoctorInfoServiceImpl;
 import com.diagbot.vo.DoctorInfoVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description:
@@ -25,4 +29,14 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
         List<DoctorInfoDTO> doctorInfoDTOList = this.getDoctorInfos(doctorInfoVo.getDoctorCode(), doctorInfoVo.getHosptialCode(), doctorInfoVo.getDeptCode());
         return doctorInfoDTOList;
     }
+    
+    /**
+     * 根据ids获取医生信息map
+     * @param ids 医生ids
+     * @return 医生信息
+     */
+    public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
+    	Map<Long, DoctorInfo> doctorInfoMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i -> i));
+        return doctorInfoMap;
+    }
 }

tran-service/src/main/java/com/diagbot/facade/HospitalDeptFacade.java

@@ -1,5 +1,11 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.entity.HospitalDept;
@@ -7,7 +13,6 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HospitalDeptServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.HospitalDeptInfoVO;
-import org.springframework.stereotype.Component;
 
 /**
  * @author rgb
@@ -33,4 +38,15 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
         BeanUtil.copyProperties(hospitalDept,hospitalDeptInfoDTO);
         return hospitalDeptInfoDTO;
     }
+    
+    /**
+     * 根据ids获取科室信息map
+     * @param ids 科室ids
+     * @return 科室信息
+     */
+    public Map<Long, HospitalDept> hospitalDeptInfoMapByIds(List<Long> ids) {
+    	Map<Long, HospitalDept> hospitalDeptMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N") && i.getStatus() == 1).collect(Collectors.toMap(HospitalDept::getId, i -> i));
+        return hospitalDeptMap;
+    }
+    
 }

tran-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -1,15 +1,12 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
 import com.diagbot.dto.HospitalInfoDTO;
-import com.diagbot.entity.HospitalInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
 
 /**
  * @Description:
@@ -30,18 +27,4 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
         return hospitalInfoDTOList;
     }
 
-    /**
-     * 通过医院编码获取医院信息
-     *
-     * @param code 医院编码
-     * @return
-     */
-    public HospitalInfo getHospitalByCode(String code) {
-        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("code", code);
-        queryWrapper.eq("status", StatusEnum.Enable.getKey());
-        return this.getOne(queryWrapper);
-    }
-
-}
+}

tran-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -1,13 +1,15 @@
 package com.diagbot.facade;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.PatientInfo;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
@@ -52,18 +54,14 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
     }
 
     /**
-     * 通过医院编码、病人编码获取病人信息
-     *
-     * @param hospitalCode 医院编码
-     * @param patientCode  病人编码
-     * @return
+     * 根据ids获取病人信息
+     * @param ids 病人ids
+     * @return 病人信息
      */
-    public PatientInfo getPatientByCode(String hospitalCode, String patientCode) {
-        QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<PatientInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("hospital_code", hospitalCode);
-        queryWrapper.eq("code", patientCode);
-        return this.getOne(queryWrapper);
+    public Map<Long, PatientInfo> patientInfoMapByIds(List<Long> ids) {
+    	Map<Long, PatientInfo> patientInfoMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(PatientInfo::getId, i -> i));
+    	return patientInfoMap;
     }
+    
 
 }

tran-service/src/main/java/com/diagbot/web/DoctorInfoController.java

@@ -1,21 +1,27 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DoctorInfo;
 import com.diagbot.facade.DoctorInfoFacade;
 import com.diagbot.vo.DoctorInfoVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-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;
-import java.util.List;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -41,8 +47,18 @@ public class DoctorInfoController {
                     "doctorCode: 医生编号，必填<br>")
     @PostMapping("/getDoctorInfo")
     @SysLogger("getDoctorInfo")
+    @ApiIgnore
     public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@Valid @RequestBody DoctorInfoVO doctorInfoVo) {
         List<DoctorInfoDTO> data = doctorInfoFacade.getDoctorInfo(doctorInfoVo);
         return RespDTO.onSuc(data);
     }
+    
+    @PostMapping(value = "/doctorInfoMapByIds")
+    @SysLogger("doctorInfoMapByIds")
+    @ApiOperation(value = "根据ids获取医生信息map[by:rengb]")
+    @ApiIgnore
+    RespDTO<Map<Long, DoctorInfo>> doctorInfoMapByIds(@RequestBody List<Long> ids) {
+        Map<Long, DoctorInfo> result = doctorInfoFacade.doctorInfoMapByIds(ids);
+        return RespDTO.onSuc(result);
+    }
 }

tran-service/src/main/java/com/diagbot/web/HospitalDeptInfoController.java

@@ -1,21 +1,27 @@
 package com.diagbot.web;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HospitalDept;
 import com.diagbot.facade.HospitalDeptFacade;
 import com.diagbot.vo.HospitalDeptInfoVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.validation.Valid;
-
 /**
  * @Description:
  * @author: wangyu
@@ -40,4 +46,14 @@ public class HospitalDeptInfoController {
         HospitalDeptInfoDTO data = hospitalDeptFacade.getHospitalDeptInfo(hospitalDeptInfoVO);
         return RespDTO.onSuc(data);
     }
+    
+    @PostMapping(value = "/hospitalDeptInfoMapByIds")
+    @SysLogger("hospitalDeptInfoMapByIds")
+    @ApiOperation(value = "根据ids获取科室信息map[by:rengb]")
+    @ApiIgnore
+    RespDTO<Map<Long, HospitalDept>> hospitalDeptInfoMapByIds(@RequestBody List<Long> ids) {
+        Map<Long, HospitalDept> result = hospitalDeptFacade.hospitalDeptInfoMapByIds(ids);
+        return RespDTO.onSuc(result);
+    }
+    
 }

tran-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -1,6 +1,9 @@
 package com.diagbot.web;
 
 
+import java.util.List;
+import java.util.Map;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +16,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.PatientInfo;
 import com.diagbot.facade.PatientInfoFacade;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
@@ -56,8 +60,18 @@ public class PatientInfoController {
                     "patientCode:医院患者编号，必填<br>")
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
+   	@ApiIgnore
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
+   
+   @PostMapping(value = "/patientInfoMapByIds")
+   @SysLogger("patientInfoMapByIds")
+   @ApiOperation(value = "根据ids获取病人信息[by:rengb]")
+   @ApiIgnore
+   RespDTO<Map<Long, PatientInfo>> patientInfoMapByIds(@RequestBody List<Long> ids) {
+       Map<Long, PatientInfo> result = patientInfoFacade.patientInfoMapByIds(ids);
+       return RespDTO.onSuc(result);
+   }
 
 }