From eac4ad3a785feb048e712de7cce0902b70fdb704 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 10 Oct 2024 09:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SignPatientRecordServiceImpl.java | 2 +- .../mapper/manage/patientinfo/PatientInfoMapper.xml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index b03c9e5c..98480f30 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -497,7 +497,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { .filter(labelField-> ObjectUtils.isNotEmpty(labelField.getTaskPartitionDictId())) .collect(Collectors.groupingBy(LabelFieldInfoContentVo::getTaskPartitionDictId)); // 查询用药 - List drugList = labelFieldContentList.stream().filter(labelField->labelField.getFieldCode().equals("DRUGNAME")).collect(Collectors.toList()); + List drugList = labelFieldContentList.stream().filter(labelField->labelField.getFieldCode().equals("DRUGNAME") && StringUtils.isNotBlank(labelField.getFieldValue())).collect(Collectors.toList()); // 包含用药的标签列表 List drugLabelList = new ArrayList<>(); for (LabelFieldInfoContentVo drugName : drugList) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index 42652c09..50c26bba 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -233,7 +233,11 @@ 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_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 when pts.task_num = 0 then 0 else