Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
143b0e2f
提交
143b0e2f
编写于
5月 25, 2023
作者:
wangxinxu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
获取用户信息
上级
9bdbf01b
流水线
#52928
已失败 于阶段
变更
10
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
80 行增加
和
21 行删除
+80
-21
pom.xml
client/pom.xml
+2
-2
PatHealthPackClient.java
...ica/cloud/account/account/client/PatHealthPackClient.java
+4
-4
pom.xml
common/pom.xml
+1
-1
AcctSelfPatInfoResp.java
...loud/account/account/common/resp/AcctSelfPatInfoResp.java
+42
-0
pom.xml
server/pom.xml
+1
-1
PatHealthPackController.java
...nt/account/server/controller/PatHealthPackController.java
+7
-4
AcctPatFamilyMapper.java
...ud/account/account/server/mapper/AcctPatFamilyMapper.java
+3
-1
PatHealthPackService.java
.../account/account/server/service/PatHealthPackService.java
+3
-4
PatHealthPackServiceIml.java
.../account/server/service/impl/PatHealthPackServiceIml.java
+7
-4
AcctPatFamilyMapper.xml
server/src/main/resources/mybatis/AcctPatFamilyMapper.xml
+10
-0
未找到文件。
client/pom.xml
浏览文件 @
143b0e2f
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<groupId>
com.pica.cloud.account
</groupId>
<groupId>
com.pica.cloud.account
</groupId>
<artifactId>
pica-cloud-account-client
</artifactId>
<artifactId>
pica-cloud-account-client
</artifactId>
<version>
1.1.
7
-SNAPSHOT
</version>
<version>
1.1.
8
-SNAPSHOT
</version>
<name>
pica-cloud-account-client
</name>
<name>
pica-cloud-account-client
</name>
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<dependency>
<dependency>
<groupId>
com.pica.cloud.account
</groupId>
<groupId>
com.pica.cloud.account
</groupId>
<artifactId>
pica-cloud-account-common
</artifactId>
<artifactId>
pica-cloud-account-common
</artifactId>
<version>
1.1.
7
-SNAPSHOT
</version>
<version>
1.1.
8
-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
...
...
client/src/main/java/com/pica/cloud/account/account/client/PatHealthPackClient.java
浏览文件 @
143b0e2f
package
com
.
pica
.
cloud
.
account
.
account
.
client
;
package
com
.
pica
.
cloud
.
account
.
account
.
client
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.resp.AcctPatIdResp
;
import
com.pica.cloud.account.account.common.resp.*
;
import
com.pica.cloud.account.account.common.resp.AcctSelfPatId
;
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
com.pica.cloud.foundation.entity.PicaResponse
;
import
org.springframework.cloud.netflix.feign.FeignClient
;
import
org.springframework.cloud.netflix.feign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -57,4 +54,7 @@ public interface PatHealthPackClient {
...
@@ -57,4 +54,7 @@ public interface PatHealthPackClient {
@PostMapping
(
value
=
"/account/pat-health/acct/updatePatByAcctId"
)
@PostMapping
(
value
=
"/account/pat-health/acct/updatePatByAcctId"
)
PicaResponse
<
Boolean
>
updatePatByAcctId
(
@RequestBody
UpdateAcctPatInfoReq
req
);
PicaResponse
<
Boolean
>
updatePatByAcctId
(
@RequestBody
UpdateAcctPatInfoReq
req
);
@GetMapping
(
value
=
"/account/pat-health/acctInfo/patId/{patientId}"
)
PicaResponse
<
AcctSelfPatInfoResp
>
getAcctInfoByPatId
(
@PathVariable
(
"patientId"
)
Integer
patientId
);
}
}
common/pom.xml
浏览文件 @
143b0e2f
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<groupId>
com.pica.cloud.account
</groupId>
<groupId>
com.pica.cloud.account
</groupId>
<artifactId>
pica-cloud-account-common
</artifactId>
<artifactId>
pica-cloud-account-common
</artifactId>
<version>
1.1.
7
-SNAPSHOT
</version>
<version>
1.1.
8
-SNAPSHOT
</version>
<name>
pica-cloud-account-common
</name>
<name>
pica-cloud-account-common
</name>
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
...
...
common/src/main/java/com/pica/cloud/account/account/common/resp/AcctSelfPatInfoResp.java
0 → 100644
浏览文件 @
143b0e2f
package
com
.
pica
.
cloud
.
account
.
account
.
common
.
resp
;
public
class
AcctSelfPatInfoResp
{
private
Integer
accId
;
private
Integer
patientId
;
private
String
name
;
private
String
mobilePhone
;
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getMobilePhone
()
{
return
mobilePhone
;
}
public
void
setMobilePhone
(
String
mobilePhone
)
{
this
.
mobilePhone
=
mobilePhone
;
}
public
Integer
getAccId
()
{
return
accId
;
}
public
void
setAccId
(
Integer
accId
)
{
this
.
accId
=
accId
;
}
public
Integer
getPatientId
()
{
return
patientId
;
}
public
void
setPatientId
(
Integer
patientId
)
{
this
.
patientId
=
patientId
;
}
}
server/pom.xml
浏览文件 @
143b0e2f
...
@@ -167,7 +167,7 @@
...
@@ -167,7 +167,7 @@
<dependency>
<dependency>
<groupId>
com.pica.cloud.account
</groupId>
<groupId>
com.pica.cloud.account
</groupId>
<artifactId>
pica-cloud-account-common
</artifactId>
<artifactId>
pica-cloud-account-common
</artifactId>
<version>
1.1.
7
-SNAPSHOT
</version>
<version>
1.1.
8
-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/PatHealthPackController.java
浏览文件 @
143b0e2f
...
@@ -2,10 +2,7 @@
...
@@ -2,10 +2,7 @@
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
controller
;
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
controller
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.resp.AcctPatIdResp
;
import
com.pica.cloud.account.account.common.resp.*
;
import
com.pica.cloud.account.account.common.resp.AcctSelfPatId
;
import
com.pica.cloud.account.account.common.resp.PatBindResp
;
import
com.pica.cloud.account.account.common.resp.PatFamilyResp
;
import
com.pica.cloud.account.account.server.service.AccountPatFamilyRecordService
;
import
com.pica.cloud.account.account.server.service.AccountPatFamilyRecordService
;
import
com.pica.cloud.account.account.server.service.PatHealthPackService
;
import
com.pica.cloud.account.account.server.service.PatHealthPackService
;
import
com.pica.cloud.foundation.entity.PicaResponse
;
import
com.pica.cloud.foundation.entity.PicaResponse
;
...
@@ -121,4 +118,10 @@ public class PatHealthPackController {
...
@@ -121,4 +118,10 @@ public class PatHealthPackController {
return
PicaResponse
.
toResponse
(
packService
.
updatePatByAcctId
(
req
));
return
PicaResponse
.
toResponse
(
packService
.
updatePatByAcctId
(
req
));
}
}
@ApiOperation
(
"获取主账户-作为监护人自身patientId"
)
@GetMapping
(
value
=
"/acctInfo/patId/{patientId}"
)
public
PicaResponse
<
AcctSelfPatInfoResp
>
getAcctInfoByPatId
(
@PathVariable
(
"patientId"
)
Integer
patientId
)
throws
Exception
{
return
PicaResponse
.
toResponse
(
packService
.
getAcctInfoByPatId
(
patientId
));
}
}
}
server/src/main/java/com/pica/cloud/account/account/server/mapper/AcctPatFamilyMapper.java
浏览文件 @
143b0e2f
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
mapper
;
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
mapper
;
import
com.pica.cloud.account.account.common.re
q.AcctPatPageReq
;
import
com.pica.cloud.account.account.common.re
sp.AcctSelfPatInfoResp
;
import
com.pica.cloud.account.account.server.entity.AcctPatFamily
;
import
com.pica.cloud.account.account.server.entity.AcctPatFamily
;
import
java.util.List
;
import
java.util.List
;
...
@@ -47,4 +47,6 @@ public interface AcctPatFamilyMapper {
...
@@ -47,4 +47,6 @@ public interface AcctPatFamilyMapper {
List
<
AcctPatFamily
>
getMemberListByPatIds
(
List
<
Integer
>
patIds
);
List
<
AcctPatFamily
>
getMemberListByPatIds
(
List
<
Integer
>
patIds
);
List
<
Integer
>
queryPatIdByPage
(
Map
map
);
List
<
Integer
>
queryPatIdByPage
(
Map
map
);
AcctSelfPatInfoResp
getAcctInfoByPatIdSelf
(
Integer
patId
);
}
}
\ No newline at end of file
server/src/main/java/com/pica/cloud/account/account/server/service/PatHealthPackService.java
浏览文件 @
143b0e2f
...
@@ -2,10 +2,7 @@
...
@@ -2,10 +2,7 @@
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
service
;
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
service
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.resp.AcctPatIdResp
;
import
com.pica.cloud.account.account.common.resp.*
;
import
com.pica.cloud.account.account.common.resp.AcctSelfPatId
;
import
com.pica.cloud.account.account.common.resp.PatBindResp
;
import
com.pica.cloud.account.account.common.resp.PatFamilyResp
;
import
io.swagger.models.auth.In
;
import
io.swagger.models.auth.In
;
import
java.util.List
;
import
java.util.List
;
...
@@ -45,4 +42,6 @@ public interface PatHealthPackService {
...
@@ -45,4 +42,6 @@ public interface PatHealthPackService {
AcctSelfPatId
getAcctIdByMobile
(
String
mobile
);
AcctSelfPatId
getAcctIdByMobile
(
String
mobile
);
boolean
updatePatByAcctId
(
UpdateAcctPatInfoReq
req
);
boolean
updatePatByAcctId
(
UpdateAcctPatInfoReq
req
);
AcctSelfPatInfoResp
getAcctInfoByPatId
(
Integer
patientId
);
}
}
server/src/main/java/com/pica/cloud/account/account/server/service/impl/PatHealthPackServiceIml.java
浏览文件 @
143b0e2f
...
@@ -4,10 +4,7 @@ package com.pica.cloud.account.account.server.service.impl;
...
@@ -4,10 +4,7 @@ package com.pica.cloud.account.account.server.service.impl;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.req.*
;
import
com.pica.cloud.account.account.common.resp.AcctPatIdResp
;
import
com.pica.cloud.account.account.common.resp.*
;
import
com.pica.cloud.account.account.common.resp.AcctSelfPatId
;
import
com.pica.cloud.account.account.common.resp.PatBindResp
;
import
com.pica.cloud.account.account.common.resp.PatFamilyResp
;
import
com.pica.cloud.account.account.server.entity.AcctPatFamily
;
import
com.pica.cloud.account.account.server.entity.AcctPatFamily
;
import
com.pica.cloud.account.account.server.entity.AcctPatInfo
;
import
com.pica.cloud.account.account.server.entity.AcctPatInfo
;
import
com.pica.cloud.account.account.server.entity.AcctPatUnion
;
import
com.pica.cloud.account.account.server.entity.AcctPatUnion
;
...
@@ -22,6 +19,7 @@ import com.pica.cloud.account.account.server.service.PatHealthPackService;
...
@@ -22,6 +19,7 @@ import com.pica.cloud.account.account.server.service.PatHealthPackService;
import
com.pica.cloud.foundation.encryption.common.constants.EncryptConstants
;
import
com.pica.cloud.foundation.encryption.common.constants.EncryptConstants
;
import
com.pica.cloud.foundation.encryption.util.EncryptUtils
;
import
com.pica.cloud.foundation.encryption.util.EncryptUtils
;
import
com.pica.cloud.foundation.entity.PicaException
;
import
com.pica.cloud.foundation.entity.PicaException
;
import
com.pica.cloud.foundation.utils.utils.StringUtil
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -617,4 +615,9 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
...
@@ -617,4 +615,9 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
return
true
;
return
true
;
}
}
@Override
public
AcctSelfPatInfoResp
getAcctInfoByPatId
(
Integer
patientId
)
{
return
patFamilyMapper
.
getAcctInfoByPatIdSelf
(
patientId
);
}
}
}
server/src/main/resources/mybatis/AcctPatFamilyMapper.xml
浏览文件 @
143b0e2f
...
@@ -270,4 +270,14 @@
...
@@ -270,4 +270,14 @@
limit #{begin},#{end}
limit #{begin},#{end}
</select>
</select>
<select
id=
"getAcctInfoByPatIdSelf"
parameterType=
"java.lang.Integer"
resultType=
"com.pica.cloud.account.account.common.resp.AcctSelfPatInfoResp"
>
select
api.id as accId, pf.patient_id as patientId, api.name , api.mobile_phone as mobilePhone
from account_pat_family pf, account_pat_info api
where pf.patient_id = #{patientId,jdbcType=INTEGER}
AND pf.relation = 1
and pf.delete_flag = 1
and pf.acct_id = api.id
and api.delete_flag = 1
</select>
</mapper>
</mapper>
\ No newline at end of file
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录