From ed5c15990bfafad6ddcda85d14126894a09f4b2c Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 25 Apr 2024 17:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=AB=AF=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientinfo/IPatientInfoService.java | 10 ++--- .../ISignPatientManageRouteNodeService.java | 8 ++-- ...SignPatientManageRouteNodeServiceImpl.java | 11 ++--- ...ListVo.java => AppletRouteNodeListVo.java} | 8 +++- .../AppletSignPatientTaskController.java | 6 +-- .../mobile/service/MobileTestService.java | 10 ----- .../service/impl/MobileTestServiceImpl.java | 14 ------ .../MobileRouteNodeListVo.java | 44 ------------------- 8 files changed, 25 insertions(+), 86 deletions(-) rename postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/{MobileRouteNodeListVo.java => AppletRouteNodeListVo.java} (93%) delete mode 100644 postdischarge-mobile/src/main/java/com/xinelu/mobile/service/MobileTestService.java delete mode 100644 postdischarge-mobile/src/main/java/com/xinelu/mobile/service/impl/MobileTestServiceImpl.java delete mode 100644 postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index c8f70f83..223979f0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -17,7 +17,7 @@ public interface IPatientInfoService { * @param id 患者信息主键 * @return 患者信息 */ - public PatientInfo selectPatientInfoById(Long id); + PatientInfo selectPatientInfoById(Long id); /** * 查询患者信息列表 @@ -25,7 +25,7 @@ public interface IPatientInfoService { * @param patientInfo 患者信息 * @return 患者信息集合 */ - public List selectPatientInfoList(PatientInfoDto patientInfo); + List selectPatientInfoList(PatientInfoDto patientInfo); /** * 新增患者信息 @@ -41,7 +41,7 @@ public interface IPatientInfoService { * @param patientInfo 患者信息 * @return 结果 */ - public PatientInfo updatePatientInfo(PatientInfo patientInfo); + PatientInfo updatePatientInfo(PatientInfo patientInfo); /** * 批量删除患者信息 @@ -49,7 +49,7 @@ public interface IPatientInfoService { * @param ids 需要删除的患者信息主键集合 * @return 结果 */ - public int deletePatientInfoByIds(Long[] ids); + int deletePatientInfoByIds(Long[] ids); /** * 删除患者信息信息 @@ -57,5 +57,5 @@ public interface IPatientInfoService { * @param id 患者信息主键 * @return 结果 */ - public int deletePatientInfoById(Long id); + int deletePatientInfoById(Long id); } 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 0a9625d5..61593a6f 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 @@ -5,7 +5,7 @@ import com.xinelu.manage.dto.signpatientmanageroutenode.MobilePatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.PatientTaskDto; import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto; import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto; -import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo; +import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo; import com.xinelu.manage.vo.signpatientmanageroutenode.PatientTaskVo; import com.xinelu.manage.vo.signpatientmanageroutenode.SignPatientManageRouteNodeVo; import java.util.List; @@ -24,7 +24,7 @@ public interface ISignPatientManageRouteNodeService { * @param id 签约患者管理任务路径节点主键 * @return 签约患者管理任务路径节点 */ - public SignPatientManageRouteNode selectSignPatientManageRouteNodeById(Long id); + SignPatientManageRouteNode selectSignPatientManageRouteNodeById(Long id); /** * 查询患者管理路径节点 @@ -55,7 +55,7 @@ public interface ISignPatientManageRouteNodeService { * @param signPatientManageRouteNode 签约患者管理任务路径节点 * @return 结果 */ - public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode); + int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode); /** * 修改签约患者管理任务路径节点 @@ -100,6 +100,6 @@ public interface ISignPatientManageRouteNodeService { * @param mobilePatientTaskDto 小程序任务列表查询传输对象 * @return */ - List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto); + List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto); } 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 3118b506..5b7b4724 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 @@ -31,7 +31,7 @@ import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRo import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import com.xinelu.manage.vo.questionInfo.QuestionVO; -import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo; +import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo; import com.xinelu.manage.vo.signpatientmanageroutenode.PatientTaskVo; import com.xinelu.manage.vo.signpatientmanageroutenode.SignPatientManageRouteNodeInfoVo; import com.xinelu.manage.vo.signpatientmanageroutenode.SignPatientManageRouteNodeVo; @@ -252,9 +252,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage return flag; } - @Override public List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { + @Override public List getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { // 根据居民信息表主键查询患者信息 - List retList = new ArrayList<>(); + List retList = new ArrayList<>(); // 查询患者表信息 PatientInfoDto patientQuery = new PatientInfoDto(); patientQuery.setResidentId(mobilePatientTaskDto.getResidentId()); @@ -317,8 +317,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage executeTime = LocalDateTime.of(patientVisitRecord.getVisitDate().plusDays(node.getRouteNodeDay()).toLocalDate(), et); break; } - retList.add(MobileRouteNodeListVo.builder() + retList.add(AppletRouteNodeListVo.builder() .id(node.getId()) + .patientName(patientInfo.getPatientName()) .hospitalAgencyName(patientVisitRecord.getHospitalAgencyName()) .manageRouteId(node.getManageRouteId()) .manageRouteName(node.getManageRouteName()) @@ -332,7 +333,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage } // 按照时间顺序排序 if (CollectionUtils.isNotEmpty(retList)) { - retList = retList.stream().sorted(Comparator.comparing(MobileRouteNodeListVo::getExecuteTime)).collect(Collectors.toList()); + retList = retList.stream().sorted(Comparator.comparing(AppletRouteNodeListVo::getExecuteTime)).collect(Collectors.toList()); } return retList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/AppletRouteNodeListVo.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/AppletRouteNodeListVo.java index bf170e65..a4520be5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/AppletRouteNodeListVo.java @@ -19,11 +19,17 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class MobileRouteNodeListVo { +public class AppletRouteNodeListVo { /** 主键id */ private Long id; + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + private String patientName; + /** 所属医院名称 */ @ApiModelProperty(value = "所属医院名称") private String hospitalAgencyName; 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 209c7a30..0d6a5eee 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 @@ -5,7 +5,7 @@ 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.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; -import com.xinelu.manage.vo.signpatientmanageroutenode.MobileRouteNodeListVo; +import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -33,8 +33,8 @@ public class AppletSignPatientTaskController extends BaseController { */ @ApiOperation("任务列表列表") @GetMapping("/getTaskList") - public R> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) { - List list = signNodeService.getMobileTaskList(mobilePatientTaskDto); + public R> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) { + List list = signNodeService.getMobileTaskList(mobilePatientTaskDto); return R.ok(list); } diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/MobileTestService.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/MobileTestService.java deleted file mode 100644 index 588df008..00000000 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/MobileTestService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.mobile.service; - -/** - * @Description 测试service接口 - * @Author 纪寒 - * @Date 2024-02-18 17:00:31 - * @Version 1.0 - */ -public interface MobileTestService { -} diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/impl/MobileTestServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/impl/MobileTestServiceImpl.java deleted file mode 100644 index 3aa1b56f..00000000 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/impl/MobileTestServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xinelu.mobile.service.impl; - -import com.xinelu.mobile.service.MobileTestService; -import org.springframework.stereotype.Service; - -/** - * @Description 测试service实现类 - * @Author 纪寒 - * @Date 2024-02-18 17:00:54 - * @Version 1.0 - */ -@Service -public class MobileTestServiceImpl implements MobileTestService { -} diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java deleted file mode 100644 index 3f01754a..00000000 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/signpatientmanageroutenode/MobileRouteNodeListVo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.xinelu.mobile.vo.signpatientmanageroutenode; - -import com.xinelu.common.annotation.Excel; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @description: 患者管理路径节点查询返回视图类 - * @author: haown - * @create: 2024-04-17 11:04 - **/ -@ApiModel("患者管理路径节点查询返回视图类") -@Data -public class MobileRouteNodeListVo { - - /** 主键id */ - private Long id; - - /** 签约患者管理任务表id */ - @ApiModelProperty(value = "签约患者管理任务表id") - @Excel(name = "签约患者管理任务表id") - private Long manageRouteId; - - /** 路径名称（任务名称） */ - @ApiModelProperty(value = "路径名称") - @Excel(name = "路径名称", readConverterExp = "任=务名称") - private String manageRouteName; - - /** 管理路径节点名称 */ - @ApiModelProperty(value = "管理路径节点名称") - @Excel(name = "管理路径节点名称") - private String routeNodeName; - - /** 管理路径节点时间，时间单位为：天 */ - @ApiModelProperty(value = "管理路径节点时间，时间单位为：天") - @Excel(name = "管理路径节点时间，时间单位为：天") - private Integer routeNodeDay; - - /** 任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP */ - @ApiModelProperty(value = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP") - @Excel(name = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP") - private String taskType; -}