fix interface

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

@@ -26,8 +26,8 @@ public interface PatHealthPackClient {
     @GetMapping(value = "/account/pat-health/directPatIds/{patientId}")
     PicaResponse<List<Integer>> getDirectPatIdsByPatId(@PathVariable("patientId") Integer patientId);
 
-    @GetMapping(value = "/account/pat-health/familyPats/{acctId}")
-    PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId);
+    @GetMapping(value = "/account/pat-health/familyPats/{acctId}/containAcct/{containAcct}")
+    PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId, @PathVariable("containAcct") Integer containAcct);
 
     @PostMapping(value = "/account/pat-health/acct")
     PicaResponse<Integer> saveAcct(@RequestBody AcctPatInfoReq patInfoReq);

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

@@ -14,10 +14,20 @@ public class PatFamilyResp {
 
     private List<AcctPatFamilyDto> failMemberList;
 
+    private List<AcctPatFamilyDto> memberList;
+
     private List<Integer> memberPatIds;
 
     private String failMsg;
 
+    public List<AcctPatFamilyDto> getMemberList() {
+        return memberList;
+    }
+
+    public void setMemberList(List<AcctPatFamilyDto> memberList) {
+        this.memberList = memberList;
+    }
+
     public String getFailMsg() {
         return failMsg;
     }

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

@@ -49,9 +49,9 @@ public class PatHealthPackController {
     }
 
     @ApiOperation("根据accid获取家庭关系idList")
-    @GetMapping(value = "/familyPats/{acctId}")
-    public PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId) throws Exception {
-        return PicaResponse.toResponse(packService.getFamilyPatsByAcctId(acctId));
+    @GetMapping(value = "/familyPats/{acctId}/containAcct/{containAcct}")
+    public PicaResponse<PatFamilyResp> getFamilyPatsByAcctId(@PathVariable("acctId") Integer acctId,@PathVariable("containAcct") Integer containAcct) throws Exception {
+        return PicaResponse.toResponse(packService.getFamilyPatsByAcctId(acctId,containAcct));
     }
 
     @ApiOperation("保存主账户")

server/src/main/java/com/pica/cloud/account/account/server/service/PatHealthPackService.java

@@ -24,7 +24,7 @@ public interface PatHealthPackService {
 
     List<Integer> getDirectPatIdsByPatId(Integer patientId);
 
-    PatFamilyResp getFamilyPatsByAcctId(Integer acctId);
+    PatFamilyResp getFamilyPatsByAcctId(Integer acctId,Integer containAcct);
 
     Integer saveAcct(AcctPatInfoReq patInfoReq);
 

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PatHealthPackServiceIml.java

@@ -102,19 +102,43 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
     }
 
 
+    /**
+     * @Description TODO
+     * @Author peijun.zhao
+     * @Date 2020/5/19 18:03
+     * @ModifyDate 2020/5/19 18:03
+     * @Params [acctId, containAcct] containAcct：是否包含建立acct的账户
+     * @Return com.pica.cloud.account.account.common.resp.PatFamilyResp
+     */
     @Override
-    public PatFamilyResp getFamilyPatsByAcctId(Integer acctId) {
+    public PatFamilyResp getFamilyPatsByAcctId(Integer acctId, Integer containAcct) {
         PatFamilyResp resp = new PatFamilyResp();
         List<AcctPatFamily> patFamilyList = patFamilyMapper.getListByAcctId(acctId);
-        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);
+        List<Integer> allPadIds = patFamilyList.stream().map(obj ->obj.getPatientId()).collect(toList());
+        if(1 == containAcct){
+            resp.setMemberPatIds(allPadIds);
+            for(AcctPatFamily family : patFamilyList){
+                AcctPatFamilyDto dto = new AcctPatFamilyDto();
+                dto.setPatientId(family.getPatientId());
+                dto.setRelation(family.getRelation());
+                dtos.add(dto);
+            }
+        }else if(0 == containAcct){
+            //不包含建立acct账户的pat数据
+            patFamilyList = patFamilyMapper.getListByPatIds(allPadIds);
+            for(AcctPatFamily family : patFamilyList){
+                AcctPatFamilyDto dto = new AcctPatFamilyDto();
+                if(!dto.getRelation().equals(1)){
+                    dto.setPatientId(family.getPatientId());
+                    dto.setRelation(family.getRelation());
+                }
+                dtos.add(dto);
+            }
+            resp.setMemberPatIds(dtos.stream().map(obj ->obj.getPatientId()).collect(toList()));
         }
-        resp.setFailMemberList(dtos);
+
+        resp.setMemberList(dtos);
         return resp;
     }