修改类名。

This commit is contained in:
haown 2024-04-28 16:59:23 +08:00
parent 97f6d465cb
commit 5b8a78447b
5 changed files with 15 additions and 16 deletions

View File

@ -291,7 +291,7 @@ public class PatientInfo extends BaseEntity {
* 门诊号门诊患者 * 门诊号门诊患者
*/ */
@ApiModelProperty(value = "门诊号") @ApiModelProperty(value = "门诊号")
@Excel(name = "门诊号", readConverterExp = "=诊患者") @Excel(name = "门诊号", readConverterExp = "诊患者")
private String outpatientNumber; private String outpatientNumber;
/** /**
@ -306,7 +306,7 @@ public class PatientInfo extends BaseEntity {
* 出院方式出院患者 * 出院方式出院患者
*/ */
@ApiModelProperty(value = "出院方式") @ApiModelProperty(value = "出院方式")
@Excel(name = "出院方式", readConverterExp = "=院患者") @Excel(name = "出院方式", readConverterExp = "院患者")
private String dischargeMethod; private String dischargeMethod;
/** /**

View File

@ -12,7 +12,7 @@ import lombok.Data;
**/ **/
@ApiModel("小程序-患者任务列表查询传输对象") @ApiModel("小程序-患者任务列表查询传输对象")
@Data @Data
public class MobilePatientTaskDto { public class AppletPatientTaskDto {
/** /**
* 居民信息表主键 * 居民信息表主键

View File

@ -1,7 +1,7 @@
package com.xinelu.manage.service.signpatientmanageroutenode; package com.xinelu.manage.service.signpatientmanageroutenode;
import com.xinelu.manage.domain.signpatientmanageroutenode.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.PatientTaskDto;
import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto; import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto;
import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto; import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto;
@ -97,9 +97,9 @@ public interface ISignPatientManageRouteNodeService {
/** /**
* 小程序端任务列表 * 小程序端任务列表
* @param mobilePatientTaskDto 小程序任务列表查询传输对象 * @param appletPatientTaskDto 小程序任务列表查询传输对象
* @return * @return 小程序患者管理路径节点列表
*/ */
List<AppletRouteNodeListVo> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto); List<AppletRouteNodeListVo> getAppletTaskList(AppletPatientTaskDto appletPatientTaskDto);
} }

View File

@ -15,7 +15,7 @@ import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord;
import com.xinelu.manage.dto.patientinfo.PatientInfoDto; 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.PatientTaskDto;
import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto; import com.xinelu.manage.dto.signpatientmanageroutenode.RouteNodeCheckDto;
import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto; import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto;
@ -252,12 +252,12 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
return flag; return flag;
} }
@Override public List<AppletRouteNodeListVo> getMobileTaskList(MobilePatientTaskDto mobilePatientTaskDto) { @Override public List<AppletRouteNodeListVo> getAppletTaskList(AppletPatientTaskDto appletPatientTaskDto) {
// 根据居民信息表主键查询患者信息 // 根据居民信息表主键查询患者信息
List<AppletRouteNodeListVo> retList = new ArrayList<>(); List<AppletRouteNodeListVo> retList = new ArrayList<>();
// 查询患者表信息 // 查询患者表信息
PatientInfoDto patientQuery = new PatientInfoDto(); PatientInfoDto patientQuery = new PatientInfoDto();
patientQuery.setResidentId(mobilePatientTaskDto.getResidentId()); patientQuery.setResidentId(appletPatientTaskDto.getResidentId());
List<PatientInfo> patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery); List<PatientInfo> patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery);
if (CollectionUtils.isEmpty(patientInfoList)) { if (CollectionUtils.isEmpty(patientInfoList)) {
return retList; return retList;
@ -284,7 +284,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
SignPatientManageRoute signRoute = signRouteList.get(0); SignPatientManageRoute signRoute = signRouteList.get(0);
SignPatientManageRouteNodeDto nodeQuery = new SignPatientManageRouteNodeDto(); SignPatientManageRouteNodeDto nodeQuery = new SignPatientManageRouteNodeDto();
nodeQuery.setManageRouteId(signRoute.getId()); nodeQuery.setManageRouteId(signRoute.getId());
nodeQuery.setTaskTypeList(Arrays.asList(mobilePatientTaskDto.getTaskTypeList().split(","))); nodeQuery.setTaskTypeList(Arrays.asList(appletPatientTaskDto.getTaskTypeList().split(",")));
List<SignPatientManageRouteNode> signNodeList = signPatientManageRouteNodeMapper.selectSignPatientManageRouteNodeList(nodeQuery); List<SignPatientManageRouteNode> signNodeList = signPatientManageRouteNodeMapper.selectSignPatientManageRouteNodeList(nodeQuery);
for (SignPatientManageRouteNode node : signNodeList) { for (SignPatientManageRouteNode node : signNodeList) {
LocalDateTime executeTime = null; LocalDateTime executeTime = null;

View File

@ -3,7 +3,7 @@ package com.xinelu.mobile.controller.appletsignpatienttask;
import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.R; import com.xinelu.common.core.domain.R;
import com.xinelu.manage.domain.signpatientmanageroutenode.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.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService;
import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo; import com.xinelu.manage.vo.signpatientmanageroutenode.AppletRouteNodeListVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -31,10 +31,10 @@ public class AppletSignPatientTaskController extends BaseController {
/** /**
* 任务列表 * 任务列表
*/ */
@ApiOperation("任务列表列表") @ApiOperation("任务列表")
@GetMapping("/getTaskList") @GetMapping("/getTaskList")
public R<List<AppletRouteNodeListVo>> getMobileTaskList(@Valid MobilePatientTaskDto mobilePatientTaskDto) { public R<List<AppletRouteNodeListVo>> getAppletTaskList(@Valid AppletPatientTaskDto appletPatientTaskDto) {
List<AppletRouteNodeListVo> list = signNodeService.getMobileTaskList(mobilePatientTaskDto); List<AppletRouteNodeListVo> list = signNodeService.getAppletTaskList(appletPatientTaskDto);
return R.ok(list); return R.ok(list);
} }
@ -47,5 +47,4 @@ public class AppletSignPatientTaskController extends BaseController {
return R.ok(signNodeService.selectSignPatientManageRouteNodeById(id)); return R.ok(signNodeService.selectSignPatientManageRouteNodeById(id));
} }
} }