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

患者导入修改

Browse Source
This commit is contained in:
zhangheng 2024-12-19 17:56:17 +08:00
parent c2b432351e
commit adf25f957e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java
View File

@ -1,6 +1,8 @@
package com.xinelu.manage.dto.signpatientmanageroutenode; package com.xinelu.manage.dto.signpatientmanageroutenode;
import com.xinelu.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate; import java.time.LocalDate;
@ -10,8 +12,9 @@ import java.time.LocalDate;
* @Author zh * @Author zh
* @Date 2024-12-13 * @Date 2024-12-13
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class UploadRobotPublishRecordDto { public class UploadRobotPublishRecordDto extends BaseEntity {
/** /**
* 科室信息 * 科室信息

6
postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java
View File

@ -411,7 +411,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService {
//科室名称一致塞值 //科室名称一致塞值
if (Objects.nonNull(equalsDepartment.getId())) { if (Objects.nonNull(equalsDepartment.getId())) {
patientInfoImport.setDepartmentId(equalsDepartment.getId()); patientInfoImport.setDepartmentId(equalsDepartment.getId());
patientInfoImport.setDepartmentName(patientInfoImport.getDepartmentName()); patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName());
patientInfoImportList.add(patientInfoImport); patientInfoImportList.add(patientInfoImport);
continue; 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); String s = departmentAbbreviation.stream().filter(Objects::nonNull).filter(item -> (patientInfoImport.getDeptAlias().equals(item))).findFirst().orElse(null);
if (StringUtils.isNotBlank(s)) { if (StringUtils.isNotBlank(s)) {
patientInfoImport.setDepartmentId(containsDepartment.getId()); patientInfoImport.setDepartmentId(containsDepartment.getId());
patientInfoImport.setDepartmentName(patientInfoImport.getDepartmentName()); patientInfoImport.setDepartmentName(containsDepartment.getDepartmentName());
patientInfoImportList.add(patientInfoImport); patientInfoImportList.add(patientInfoImport);
continue; 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()); 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()); Department equalsDepartment = departmentList.stream().filter(Objects::nonNull).filter(item -> item.getDepartmentName().equals(deptAliasVO.getDepartmentName())).findFirst().orElse(new Department());
patientInfoImport.setDepartmentId(equalsDepartment.getId()); patientInfoImport.setDepartmentId(equalsDepartment.getId());
patientInfoImport.setDepartmentName(deptAliasVO.getDepartmentName()); patientInfoImport.setDepartmentName(equalsDepartment.getDepartmentName());
} }
} }
//科室组装别名 //科室组装别名

1
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
View File

@ -1403,6 +1403,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
* @param uploadRobotPublishRecordDto 时间信息 * @param uploadRobotPublishRecordDto 时间信息
* @return UploadRobotPublishRecordVo * @return UploadRobotPublishRecordVo
*/ */
@DataScope(agencyAlias = "pi")
@Override @Override
public List<UploadRobotPublishRecordVo> uploadRobotPublishRecord(UploadRobotPublishRecordDto uploadRobotPublishRecordDto) { public List<UploadRobotPublishRecordVo> uploadRobotPublishRecord(UploadRobotPublishRecordDto uploadRobotPublishRecordDto) {
if (Objects.nonNull(uploadRobotPublishRecordDto)){ if (Objects.nonNull(uploadRobotPublishRecordDto)){

1
postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
View File

@ -1185,6 +1185,7 @@
<if test="contentedFlag != null and contentedFlag != ''"> <if test="contentedFlag != null and contentedFlag != ''">
and pqsr.contented_flag = #{contentedFlag} and pqsr.contented_flag = #{contentedFlag}
</if> </if>
${params.dataScope}
ORDER BY spmrn.create_time DESC ORDER BY spmrn.create_time DESC
</select> </select>
</mapper> </mapper>