codeReview

common/src/main/java/com/pica/cloud/account/account/common/req/InitAcctReq.java

@@ -20,6 +20,16 @@ public class InitAcctReq {
 
     private String encryMobile;
 
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getEncryMobile() {
         return encryMobile;
     }

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

@@ -189,7 +189,8 @@ public class AccountController extends AccountBaseController {
 
     @ApiOperation("H5端一键登录功能,无需完善信息")
     @PostMapping("/login-register/v1")
-//    @RepeatForbidden(uniqueKey = "content") 当前版本存在性能问题 luo优化后上
+//    @RepeatForbidden(uniqueKey = "content")
+    //当前版本存在性能问题 luo优化后上
     public PicaResponse loginRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         this.checkMobilePhone(request.getMobile());

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

@@ -43,13 +43,13 @@ public class PatHealthPackController {
         return PicaResponse.toResponse(packService.getAcctIdByPatId(patientId));
     }
 
-    @ApiOperation("上级的监护人 + 下级所有成员 patientId list")
+    @ApiOperation("所在家庭组的监护人 + 同级家庭成员 + 下级所有成员 patientId list，去除自身、去重；")
     @GetMapping(value = "/directPatIds/{patientId}")
     public PicaResponse<List<Integer>> getDirectPatIdsByPatId(@PathVariable("patientId") Integer patientId) throws Exception {
         return PicaResponse.toResponse(packService.getDirectPatIdsByPatId(patientId));
     }
 
-    @ApiOperation("根据accid获取家庭关系idList")
+    @ApiOperation("根据accid获取自身家庭成员List;containAcct:0 包含自身 1 不包含自身")
     @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));

server/src/main/java/com/pica/cloud/account/account/server/enums/SourceTypeEnum.java

@@ -14,6 +14,7 @@ public enum SourceTypeEnum {
     SAAS(3, "saas"),
     H5(4, "h5"),
     ADMIN(5, "admin"),
+    INIT(6, "初始生成-居民账户"),
 
     XXX(10, "xxxxxx");
 

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

@@ -18,15 +18,15 @@ public interface AcctPatFamilyMapper {
     int updateByPrimaryKey(AcctPatFamily record);
 
     /** 获取居民id是本人的家庭组记录- 作为家庭主账户、本人居民id，单条ok 多条异常数据 */
-    List<AcctPatFamily> getByPatIdSelf(Integer patId);
+    AcctPatFamily getByPatIdSelf(Integer patId);
 
     /** 查询居民id所在家庭组监护人- 作为家庭成员、非主账户本人居民id，单条ok 多条异常数据 */
-    List<AcctPatFamily> getByPatIdNotSelf(Integer patId);
+    AcctPatFamily getByPatIdNotSelf(Integer patId);
 
     /** 获取主账户下所有家庭成员 */
     List<AcctPatFamily> getListByAcctId(Integer acctId);
 
-    /** 根据账户id 获取主账户居民id */
+    /** 根据账户id 获取主账户居民 */
     AcctPatFamily getSelfByAcctId(Integer acctId);
 
     List<AcctPatFamily> getListByPatIds(List<Integer> patIds);

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

@@ -254,7 +254,7 @@
     values
     <foreach collection="list" item="item" index="index" separator=",">
       (
-      null,#{item.mobilePhone},
+      #{item.name},#{item.mobilePhone},
       null,1,6,
       null,null,null,null,now(),
       1,99999999,now(),