Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
long-tern-care-service
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hubin
long-tern-care-service
Commits
79815f56
Commit
79815f56
authored
Sep 25, 2023
by
zhangwanglin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出院情况查询条件
parent
608078e9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
1 deletion
+25
-1
ChSrvTaskDetailVo.java
...a/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetailVo.java
+2
-0
BuildBedMapper.java
.../java/com/hungraim/ltc/governance/dao/BuildBedMapper.java
+2
-0
BuildBedServiceImpl.java
...raim/ltc/governance/service/impl/BuildBedServiceImpl.java
+9
-0
BuildBedMapper.xml
...ces/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml
+12
-1
No files found.
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetailVo.java
View file @
79815f56
...
@@ -51,4 +51,6 @@ public class ChSrvTaskDetailVo extends BaseReq {
...
@@ -51,4 +51,6 @@ public class ChSrvTaskDetailVo extends BaseReq {
*/
*/
private
String
modeName
;
private
String
modeName
;
private
String
hospitalFlag
;
}
}
governance/src/main/java/com/hungraim/ltc/governance/dao/BuildBedMapper.java
View file @
79815f56
...
@@ -47,4 +47,6 @@ public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
...
@@ -47,4 +47,6 @@ public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
String
selectModeTypeById
(
@Param
(
"pId"
)
Long
pId
);
String
selectModeTypeById
(
@Param
(
"pId"
)
Long
pId
);
int
getRoleByUserId
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"roleIds"
)
List
<
String
>
roleIds
);
int
getRoleByUserId
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"roleIds"
)
List
<
String
>
roleIds
);
int
selectSrvSend
(
String
disabInfoId
);
}
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/BuildBedServiceImpl.java
View file @
79815f56
...
@@ -101,6 +101,15 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
...
@@ -101,6 +101,15 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
public
Page
<
ChSrvTaskDetailVo
>
chSrvTaskDetailQuery
(
Page
<
ChSrvTaskDetailVo
>
page
,
ChSrvTaskDetailVo
vo
){
public
Page
<
ChSrvTaskDetailVo
>
chSrvTaskDetailQuery
(
Page
<
ChSrvTaskDetailVo
>
page
,
ChSrvTaskDetailVo
vo
){
Page
<
ChSrvTaskDetailVo
>
chSrvTaskDetailVoPage
=
buildBedMapper
.
chSrvTaskDetailQuery
(
page
,
vo
);
Page
<
ChSrvTaskDetailVo
>
chSrvTaskDetailVoPage
=
buildBedMapper
.
chSrvTaskDetailQuery
(
page
,
vo
);
chSrvTaskDetailVoPage
.
getRecords
().
stream
().
filter
(
chSrvTaskDetail
->
{
chSrvTaskDetailVoPage
.
getRecords
().
stream
().
filter
(
chSrvTaskDetail
->
{
String
disabInfoId
=
chSrvTaskDetail
.
getDisabInfoId
();
String
hospitalFlag
=
chSrvTaskDetail
.
getHospitalFlag
();
if
(
"1"
.
equals
(
hospitalFlag
)){
int
count
=
buildBedMapper
.
selectSrvSend
(
disabInfoId
);
if
(
count
>
0
)
{
chSrvTaskDetail
.
setHospitalFlag
(
"0"
);
}
}
if
(
null
!=
chSrvTaskDetail
.
getSevStarTime
()){
if
(
null
!=
chSrvTaskDetail
.
getSevStarTime
()){
chSrvTaskDetail
.
setSevStarTime
(
chSrvTaskDetail
.
getSevStarTime
().
substring
(
0
,
19
));
chSrvTaskDetail
.
setSevStarTime
(
chSrvTaskDetail
.
getSevStarTime
().
substring
(
0
,
19
));
}
}
...
...
governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml
View file @
79815f56
...
@@ -36,7 +36,9 @@
...
@@ -36,7 +36,9 @@
info.REAL_NAME realName,--失能人员名字
info.REAL_NAME realName,--失能人员名字
info.CERTI_CODE certiCode,--失能人员身份证件号码
info.CERTI_CODE certiCode,--失能人员身份证件号码
program.PROGRAM_DATE sevStarTime,--服务开始时间
program.PROGRAM_DATE sevStarTime,--服务开始时间
program.PROGRAM_EDN_DATE sevEndTime--服务结束时间
program.PROGRAM_EDN_DATE sevEndTime,--服务结束时间
(case when info.exit_time is null then 0 else 1 end) hospitalFlag,
info.DISAB_INFO_ID disabInfoId
from ch_srv_program program
from ch_srv_program program
LEFT JOIN ch_cfg_srv_mode mode1 ON program.srv_mode_id = mode1.mode_id --服务方式
LEFT JOIN ch_cfg_srv_mode mode1 ON program.srv_mode_id = mode1.mode_id --服务方式
LEFT JOIN ch_srv_organ organ ON program.srv_organ_id = organ.srv_organ_id --服务机构
LEFT JOIN ch_srv_organ organ ON program.srv_organ_id = organ.srv_organ_id --服务机构
...
@@ -59,6 +61,9 @@
...
@@ -59,6 +61,9 @@
<if
test=
"vo.certiCode != null and vo.certiCode != ''"
>
<if
test=
"vo.certiCode != null and vo.certiCode != ''"
>
AND info.CERTI_CODE =#{vo.certiCode}
AND info.CERTI_CODE =#{vo.certiCode}
</if>
</if>
<if
test=
"vo.hospitalFlag != null and vo.hospitalFlag != ''"
>
AND (case when info.exit_time is null then 0 else 1 end) =#{vo.hospitalFlag}
</if>
<if
test=
"vo.sevStarTime != null and vo.sevStarTime != ''"
>
<if
test=
"vo.sevStarTime != null and vo.sevStarTime != ''"
>
AND program.PROGRAM_DATE
>
= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
AND program.PROGRAM_DATE
>
= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
</if>
</if>
...
@@ -68,6 +73,12 @@
...
@@ -68,6 +73,12 @@
)A
)A
where A.rn =1
where A.rn =1
</select>
</select>
<select
id=
"selectSrvSend"
resultType=
"java.lang.Integer"
>
select count(*) from CH_SRV_SEND t where t.DISAB_INFO_ID = #{disabInfoId} and
t.STATUS = 1
</select>
<select
id=
"getsrvOrgan"
resultType=
"com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO"
>
<select
id=
"getsrvOrgan"
resultType=
"com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO"
>
SELECT
SELECT
n.SRV_ORGAN_NAME srvOrganName,
n.SRV_ORGAN_NAME srvOrganName,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment