feat:新增根据patientId查询主账号id

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

@@ -39,6 +39,9 @@ public interface PatHealthPackClient {
     @GetMapping(value = "/account/pat-health/familyAcct/patId/{patId}")
     PicaResponse<Integer> getFamilyAcctPatId(@PathVariable("patId") Integer patId);
 
+    @GetMapping(value = "/account/pat-health/familyAcct/self/patId/{patId}")
+    PicaResponse<List<Integer>> getRelationSelfAcctPatId(@PathVariable("patId") Integer patId);
+
     @PostMapping(value = "/account/pat-health/familyAcct/patIds")
     PicaResponse<AcctPatIdResp> getFamilyAcctPatIds(@RequestBody AcctPatIdReq acctPatIdReq);
 

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

@@ -87,6 +87,13 @@ public class PatHealthPackController {
         return PicaResponse.toResponse(packService.getFamilyAcctPatId(patId));
     }
 
+
+    @ApiOperation("根据patientId获取监护人acctId），本人成员（监护人patId）")
+    @GetMapping(value = "/familyAcct/self/patId/{patId}")
+    public PicaResponse<List<Integer>> getRelationSelfAcctPatId(@PathVariable("patId") Integer patId) throws Exception {
+        return PicaResponse.toResponse(packService.getFamilyAcctIdsPatId(patId));
+    }
+
     @ApiOperation("根据patientIds 获取监护人-本人监护人（自身patId），本人成员（监护人patId）")
     @PostMapping(value = "/familyAcct/patIds")
     public PicaResponse<AcctPatIdResp> getFamilyAcctPatIds(@RequestBody AcctPatIdReq acctPatIdReq) throws Exception {

server/src/main/java/com/pica/cloud/account/account/server/mapper/AcctPatFamilyMapper.java

@@ -26,7 +26,7 @@ public interface AcctPatFamilyMapper {
     List<AcctPatFamily> getListByPatIdSelfs(List<Integer> list);
 
     /** 查询居民id所在家庭组监护人- 作为家庭成员、非主账户本人居民id，单条ok 多条异常数据 */
-    AcctPatFamily getByPatIdNotSelf(Integer patId);
+    List<AcctPatFamily> getByPatIdNotSelf(Integer patId);
 
     List<AcctPatFamily> getListByPatIdNotSelfs(List<Integer> list);
 

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

@@ -35,6 +35,8 @@ public interface PatHealthPackService {
 
     Integer getFamilyAcctPatId(Integer patId);
 
+    List<Integer> getFamilyAcctIdsPatId(Integer patId);
+
     AcctPatIdResp getFamilyAcctPatIds(AcctPatIdReq acctPatIdReq);
 
     Integer initAccts(List<InitAcctReq> list);

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

@@ -134,9 +134,10 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
             patIds.addAll(sonFamilyList.stream().map(obj -> obj.getPatientId()).collect(toList()));
         }
         //自身成员
-        AcctPatFamily member = patFamilyMapper.getByPatIdNotSelf(patientId);
-        if (null != member) {
+        List<AcctPatFamily> acctPatFamilyList = patFamilyMapper.getByPatIdNotSelf(patientId);
+        if (CollectionUtils.isNotEmpty(acctPatFamilyList)) {
             //存在自己作为成员身份记录,add 上级监护人
+            AcctPatFamily member = acctPatFamilyList.get(0);
             AcctPatFamily parentAcct = patFamilyMapper.getSelfByAcctId(member.getAcctId());
             if (null != parentAcct) {
                 patIds.add(parentAcct.getPatientId());
@@ -412,8 +413,9 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
             rtnPatId = acctMember.getPatientId();
         } else {
             //查询是否存在 作为成员的记录
-            AcctPatFamily member = patFamilyMapper.getByPatIdNotSelf(patId);
-            if (null != member) {
+            List<AcctPatFamily> memberList = patFamilyMapper.getByPatIdNotSelf(patId);
+            if (CollectionUtils.isNotEmpty(memberList)) {
+                AcctPatFamily member = memberList.get(0);
                 //本人为成员时记录存在
                 AcctPatFamily acctPat = patFamilyMapper.getSelfByAcctId(member.getAcctId());
                 rtnPatId = acctPat.getPatientId();
@@ -424,6 +426,32 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
         return rtnPatId;
     }
 
+    @Override
+    public List<Integer> getFamilyAcctIdsPatId(Integer patId) {
+        List<Integer> acctIdList = new ArrayList<>();
+        //查询本人
+        AcctPatFamily acctMember = patFamilyMapper.getByPatIdSelf(patId);
+        if (null != acctMember) {
+            acctIdList.add(acctMember.getAcctId());
+        }
+        //查询作为成员的主账户acctId
+        List<AcctPatFamily> acctPatFamilies = patFamilyMapper.getByPatIdNotSelf(patId);
+        if (CollectionUtils.isNotEmpty(acctPatFamilies)) {
+            List<Integer> list = acctPatFamilies.stream().map(AcctPatFamily::getAcctId).distinct().collect(toList());
+            for (Integer acctId : list) {
+                if (null == acctMember || !Objects.equals(acctId, acctMember.getAcctId())) {
+                    //本人为成员时记录存在
+                    AcctPatFamily acctPat = patFamilyMapper.getSelfByAcctId(acctId);
+                    if (null != acctPat) {
+                        acctIdList.add(acctId);
+                    }
+                }
+
+            }
+        }
+        return acctIdList;
+    }
+
 
     /**
      * @Description 根据居民id批量获取对应的主账号对应的patId

server/src/main/resources/mybatis/AcctPatFamilyMapper.xml

@@ -195,7 +195,8 @@
     from account_pat_family
     where patient_id = #{patientId,jdbcType=INTEGER}
     AND relation != 1
-    and delete_flag = 1;
+    and delete_flag = 1
+    order by modified_time desc
   </select>
 
   <select id="getListByPatIdNotSelfs" parameterType="java.util.List" resultMap="BaseResultMap" >