xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改。

Browse Source
This commit is contained in:
haown 2024-10-10 09:29:13 +08:00
parent 079f3637db
commit eac4ad3a78
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java
View File

@ -497,7 +497,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
.filter(labelField-> ObjectUtils.isNotEmpty(labelField.getTaskPartitionDictId())) .filter(labelField-> ObjectUtils.isNotEmpty(labelField.getTaskPartitionDictId()))
.collect(Collectors.groupingBy(LabelFieldInfoContentVo::getTaskPartitionDictId)); .collect(Collectors.groupingBy(LabelFieldInfoContentVo::getTaskPartitionDictId));
// 查询用药 // 查询用药
List<LabelFieldInfoContentVo> drugList = labelFieldContentList.stream().filter(labelField->labelField.getFieldCode().equals("DRUGNAME")).collect(Collectors.toList()); List<LabelFieldInfoContentVo> drugList = labelFieldContentList.stream().filter(labelField->labelField.getFieldCode().equals("DRUGNAME") && StringUtils.isNotBlank(labelField.getFieldValue())).collect(Collectors.toList());
// 包含用药的标签列表 // 包含用药的标签列表
List<LabelFieldInfoContentVo> drugLabelList = new ArrayList<>(); List<LabelFieldInfoContentVo> drugLabelList = new ArrayList<>();
for (LabelFieldInfoContentVo drugName : drugList) { for (LabelFieldInfoContentVo drugName : drugList) {

6
postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
View File

@ -233,7 +233,11 @@
WHEN sign.service_status = 'INTENTIONAL_SIGNING' THEN '意向签约' WHEN sign.service_status = 'INTENTIONAL_SIGNING' THEN '意向签约'
WHEN sign.service_status = 'SERVICE_CENTER' AND sign.route_check_status = 'AGREE' THEN '服务中' WHEN sign.service_status = 'SERVICE_CENTER' AND sign.route_check_status = 'AGREE' THEN '服务中'
WHEN sign.service_status = 'SERVICE_END' THEN '已归档' ELSE '已签约' END AS patientSignStatus, WHEN sign.service_status = 'SERVICE_END' THEN '已归档' ELSE '已签约' END AS patientSignStatus,
pts.task_num, pts.task_execute_num, pts.task_finish_num, pts.next_task_name as nextTaskName, pts.next_task_time as nextTaskTime, case when isnull(pts.task_num) then 0 else pts.task_num end as taskNum,
case when isnull(pts.task_execute_num) then 0 else pts.task_execute_num end as taskExecuteNum,
case when isnull(pts.task_finish_num) then 0 else pts.task_finish_num end as taskFinishNum,
pts.next_task_name as nextTaskName,
pts.next_task_time as nextTaskTime,
case case
when pts.task_num = 0 then 0 when pts.task_num = 0 then 0
else else