fix family return

client/src/main/java/com/pica/cloud/account/account/client/PatHealthPackClient.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.client;
 import com.pica.cloud.account.account.common.req.AcctPatFamilyReq;
 import com.pica.cloud.account.account.common.req.AcctPatInfoReq;
 import com.pica.cloud.account.account.common.resp.PatBindResp;
+import com.pica.cloud.account.account.common.resp.PatFamilyResp;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +27,7 @@ public interface PatHealthPackClient {
     PicaResponse<List<Integer>> getDirectPatIdsByPatId(@PathVariable("patientId") Integer patientId);
 
     @GetMapping(value = "/account/pat-health/familyPats/{acctId}")
-    PicaResponse<List<Integer>> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId);
+    PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId);
 
     @PostMapping(value = "/account/pat-health/acct")
     PicaResponse saveAcct(@RequestBody AcctPatInfoReq patInfoReq);

common/src/main/java/com/pica/cloud/account/account/common/resp/PatFamilyResp.java

@@ -14,6 +14,8 @@ public class PatFamilyResp {
 
     private List<AcctPatFamilyDto> failMemberList;
 
+    private List<Integer> memberPatIds;
+
     public boolean isSuccessFlag() {
         return successFlag;
     }
@@ -29,4 +31,12 @@ public class PatFamilyResp {
     public void setFailMemberList(List<AcctPatFamilyDto> failMemberList) {
         this.failMemberList = failMemberList;
     }
+
+    public List<Integer> getMemberPatIds() {
+        return memberPatIds;
+    }
+
+    public void setMemberPatIds(List<Integer> memberPatIds) {
+        this.memberPatIds = memberPatIds;
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/PatHealthPackController.java

@@ -102,9 +102,19 @@ public class PatHealthPackController {
 
     @ApiOperation("根据accid获取家庭关系idList")
     @GetMapping(value = "/familyPats/{acctId}")
-    public PicaResponse<List<Integer>> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId) throws Exception {
+    public PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId) throws Exception {
+        PatFamilyResp resp = new PatFamilyResp();
         List<AcctPatFamily> patFamilyList = patFamilyMapper.getListByAcctId(acctId);
-        return PicaResponse.toResponse(patFamilyList);
+        resp.setMemberPatIds(patFamilyList.stream().map(obj ->obj.getPatientId()).collect(toList()));
+        List<AcctPatFamilyDto> dtos =  new ArrayList<>();
+        for(AcctPatFamily family : patFamilyList){
+            AcctPatFamilyDto dto = new AcctPatFamilyDto();
+            dto.setPatientId(family.getPatientId());
+            dto.setRelation(family.getRelation());
+            dtos.add(dto);
+        }
+        resp.setFailMemberList(dtos);
+        return PicaResponse.toResponse(resp);
     }
 
     @ApiOperation("保存主账户")