急诊二次诊断添加修改

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

@@ -7,7 +7,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
@@ -132,7 +131,7 @@ public interface TranServiceClient {
      * @return
      */
     @PostMapping("/inquiryInfo/hisInquirysForJz")
-    RespDTO<IPage<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO);
+    RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO);
     
     /**
      * 急诊-添加二次诊断

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

@@ -8,7 +8,6 @@ import javax.validation.Valid;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
@@ -103,7 +102,7 @@ public class TranServiceHystrix implements TranServiceClient {
     }
     
     @Override
-	public RespDTO<IPage<HisInquirysForJzDTO>> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
+	public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
     	log.error("【hystrix】调用{}异常", "hisInquirysForJz");
 		return null;
 	}

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

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -368,8 +367,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param hisInquirysForJzVO
      * @return
      */
-    public IPage<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
-    	RespDTO<IPage<HisInquirysForJzDTO>> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
+    public List<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
+    	RespDTO<List<HisInquirysForJzDTO>> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
     	RespDTOUtil.respNGDeal(res, "获取急诊历史病历列表失败");
     	return res.data;
     }

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

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -84,7 +83,7 @@ public class InquiryInfoController {
     @ApiOperation(value = "急诊-历史病历列表[by:rengb]")
     @PostMapping("/hisInquirysForJz")
     @SysLogger("hisInquirysForJz")
-    public RespDTO<IPage<HisInquirysForJzDTO>> hisInquirysForJz(@Valid @RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+    public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@Valid @RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
     }
 

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

@@ -105,17 +105,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
      * @param hisInquirysForJzVO
      * @return
      */
-    public IPage<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
+    public List<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
     	IPage<HisInquirysForJzDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
+    	List<HisInquirysForJzDTO> hisInquirysForJzDTOList = ipage.getRecords();
     	
-    	if(ListUtil.isNotEmpty(ipage.getRecords())){
-            List<Long> patientIdList = ipage.getRecords().stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
-            List<Long> inquiryIdList = ipage.getRecords().stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
+    	if(ListUtil.isNotEmpty(hisInquirysForJzDTOList)){
+            List<Long> patientIdList = hisInquirysForJzDTOList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+            List<Long> inquiryIdList = hisInquirysForJzDTOList.stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
 
             Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
             Map<Long, List<InquiryDetail>> inquiryDetailMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
         	
-            ipage.getRecords().forEach(i -> {
+            hisInquirysForJzDTOList.forEach(i -> {
                 PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
                 if (patientInfo != null) {
                     i.setPatientName(patientInfo.getName());
@@ -131,7 +132,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
             });
     	}
     	
-    	return ipage;
+    	return hisInquirysForJzDTOList;
     }
     
     

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

@@ -1,5 +1,7 @@
 package com.diagbot.web;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -7,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.HisInquirysForJzDTO;
 import com.diagbot.dto.RespDTO;
@@ -57,7 +58,7 @@ public class InquiryInfoController {
 	 @PostMapping("/hisInquirysForJz")
 	 @SysLogger("hisInquirysForJz")
 	 @ApiIgnore
-	 public RespDTO<IPage<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+	 public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
 		 return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
 	 }