From adf25f957e85479df8d1deb9bf39b6b94cc01e2c Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 19 Dec 2024 17:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=AF=BC=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UploadRobotPublishRecordDto.java | 5 ++++- .../service/patientinfo/impl/PatientInfoServiceImpl.java | 6 +++--- .../impl/SignPatientManageRouteNodeServiceImpl.java | 1 + .../SignPatientManageRouteNodeMapper.xml | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java index 637b51db..c8108bc9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java @@ -1,6 +1,8 @@ package com.xinelu.manage.dto.signpatientmanageroutenode; +import com.xinelu.common.core.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; @@ -10,8 +12,9 @@ import java.time.LocalDate; * @Author zh * @Date 2024-12-13 */ +@EqualsAndHashCode(callSuper = true) @Data -public class UploadRobotPublishRecordDto { +public class UploadRobotPublishRecordDto extends BaseEntity { /** * 科室信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 18d9cf20..f8123f49 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -411,7 +411,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { //科室名称一致塞值 if (Objects.nonNull(equalsDepartment.getId())) { patientInfoImport.setDepartmentId(equalsDepartment.getId()); - patientInfoImport.setDepartmentName(patientInfoImport.getDepartmentName()); + patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName()); patientInfoImportList.add(patientInfoImport); continue; //科室别名一致塞值 @@ -422,7 +422,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { String s = departmentAbbreviation.stream().filter(Objects::nonNull).filter(item -> (patientInfoImport.getDeptAlias().equals(item))).findFirst().orElse(null); if (StringUtils.isNotBlank(s)) { patientInfoImport.setDepartmentId(containsDepartment.getId()); - patientInfoImport.setDepartmentName(patientInfoImport.getDepartmentName()); + patientInfoImport.setDepartmentName(containsDepartment.getDepartmentName()); patientInfoImportList.add(patientInfoImport); continue; } @@ -596,7 +596,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { DeptAliasVO deptAliasVO = patientInfoImportVO.getDeptAliasVOS().stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getDepartmentName()) && StringUtils.isNotEmpty(item.getDeptAlias()) && patientInfoImport.getDeptAlias().equals(item.getDeptAlias())).findFirst().orElse(new DeptAliasVO()); Department equalsDepartment = departmentList.stream().filter(Objects::nonNull).filter(item -> item.getDepartmentName().equals(deptAliasVO.getDepartmentName())).findFirst().orElse(new Department()); patientInfoImport.setDepartmentId(equalsDepartment.getId()); - patientInfoImport.setDepartmentName(deptAliasVO.getDepartmentName()); + patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName()); } } //科室组装别名 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 0d15c206..152886ba 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -1403,6 +1403,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage * @param uploadRobotPublishRecordDto 时间信息 * @return UploadRobotPublishRecordVo */ + @DataScope(agencyAlias = "pi") @Override public List uploadRobotPublishRecord(UploadRobotPublishRecordDto uploadRobotPublishRecordDto) { if (Objects.nonNull(uploadRobotPublishRecordDto)){ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index e56ac1dc..f13e3155 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1185,6 +1185,7 @@ and pqsr.contented_flag = #{contentedFlag} + ${params.dataScope} ORDER BY spmrn.create_time DESC