From 5b8a78447b9bd375cd9bea88fd9d027606d3df28 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Sun, 28 Apr 2024 16:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/manage/domain/patientinfo/PatientInfo.java | 4 ++-- ...bilePatientTaskDto.java => AppletPatientTaskDto.java} | 2 +- .../ISignPatientManageRouteNodeService.java | 8 ++++---- .../impl/SignPatientManageRouteNodeServiceImpl.java | 8 ++++---- .../AppletSignPatientTaskController.java | 9 ++++----- 5 files changed, 15 insertions(+), 16 deletions(-) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/{MobilePatientTaskDto.java => AppletPatientTaskDto.java} (95%) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 707a9e22..a9e16a97 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -291,7 +291,7 @@ public class PatientInfo extends BaseEntity { * 门诊号（门诊患者） */ @ApiModelProperty(value = "门诊号") - @Excel(name = "门诊号", readConverterExp = "门=诊患者") + @Excel(name = "门诊号", readConverterExp = "门诊患者") private String outpatientNumber; /** @@ -306,7 +306,7 @@ public class PatientInfo extends BaseEntity { * 出院方式（出院患者） */ @ApiModelProperty(value = "出院方式") - @Excel(name = "出院方式", readConverterExp = "出=院患者") + @Excel(name = "出院方式", readConverterExp = "出院患者") private String dischargeMethod; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/AppletPatientTaskDto.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/AppletPatientTaskDto.java index 02296feb..f5c28fac 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/MobilePatientTaskDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/AppletPatientTaskDto.java @@ -12,7 +12,7 @@ import lombok.Data; **/ @ApiModel("小程序-患者任务列表查询传输对象") @Data -public class MobilePatientTaskDto { +public class AppletPatientTaskDto { /** * 居民信息表主键 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java index 61593a6f..146f709b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java @@ -1,7 +1,7 @@ package com.xinelu.manage.service.signpatientmanageroutenode; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; -import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; +import com.xinelu.manage.dto.signpatientmanageroutenode.AppletPatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.PatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto; import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto; @@ -97,9 +97,9 @@ public interface ISignPatientManageRouteNodeService { /** * 小程序端任务列表 - * @param mobilePatientTaskDto 小程序任务列表查询传输对象 - * @return + * @param appletPatientTaskDto 小程序任务列表查询传输对象 + * @return 小程序患者管理路径节点列表 */ - List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto); + List getAppletTaskList(AppletPatientTaskDto appletPatientTaskDto); } 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 5b7b4724..3da24d44 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 @@ -15,7 +15,7 @@ import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; -import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; +import com.xinelu.manage.dto.signpatientmanageroutenode.AppletPatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.PatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto; import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto; @@ -252,12 +252,12 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage return flag; } - @Override public List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { + @Override public List getAppletTaskList(AppletPatientTaskDto appletPatientTaskDto) { // 根据居民信息表主键查询患者信息 List retList = new ArrayList<>(); // 查询患者表信息 PatientInfoDto patientQuery = new PatientInfoDto(); - patientQuery.setResidentId(mobilePatientTaskDto.getResidentId()); + patientQuery.setResidentId(appletPatientTaskDto.getResidentId()); List patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery); if (CollectionUtils.isEmpty(patientInfoList)) { return retList; @@ -284,7 +284,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage SignPatientManageRoute signRoute = signRouteList.get(0); SignPatientManageRouteNodeDto nodeQuery = new SignPatientManageRouteNodeDto(); nodeQuery.setManageRouteId(signRoute.getId()); - nodeQuery.setTaskTypeList(Arrays.asList(mobilePatientTaskDto.getTaskTypeList().split(","))); + nodeQuery.setTaskTypeList(Arrays.asList(appletPatientTaskDto.getTaskTypeList().split(","))); List signNodeList = signPatientManageRouteNodeMapper.selectSignPatientManageRouteNodeList(nodeQuery); for (SignPatientManageRouteNode node : signNodeList) { LocalDateTime executeTime = null; diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java index 0d6a5eee..26ee4e39 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletsignpatienttask/AppletSignPatientTaskController.java @@ -3,7 +3,7 @@ package com.xinelu.mobile.controller.appletsignpatienttask; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.R; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; -import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; +import com.xinelu.manage.dto.signpatientmanageroutenode.AppletPatientTaskDto; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo; import io.swagger.annotations.Api; @@ -31,10 +31,10 @@ public class AppletSignPatientTaskController extends BaseController { /** * 任务列表 */ - @ApiOperation("任务列表列表") + @ApiOperation("任务列表") @GetMapping("/getTaskList") - public R> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) { - List list = signNodeService.getMobileTaskList(mobilePatientTaskDto); + public R> getAppletTaskList(@Valid AppletPatientTaskDto appletPatientTaskDto) { + List list = signNodeService.getAppletTaskList(appletPatientTaskDto); return R.ok(list); } @@ -47,5 +47,4 @@ public class AppletSignPatientTaskController extends BaseController { return R.ok(signNodeService.selectSignPatientManageRouteNodeById(id)); } - }