diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java index 33a1ff2..f6b98f6 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscreeningrecord/AppletScreeningRecordController.java @@ -109,16 +109,16 @@ public class AppletScreeningRecordController extends BaseController { return R.ok(screeningRecordVo); } - @GetMapping("/getScreening/{registerId}") + @GetMapping("/getScreening/{patientId}") @ApiOperation(value = "获取当前预约信息") - public R getScreeningByRegisterId(@PathVariable String registerId) { - return R.ok(screeningRecordService.getScreeningByRegisterId(registerId)); + public R getScreeningByPatientId(@PathVariable String patientId) { + return R.ok(screeningRecordService.getScreeningByPatientId(patientId)); } - @GetMapping("/last/{registerId}/{projectId}") + @GetMapping("/last/{patientId}/{projectId}") @ApiOperation(value = "获取最新一次筛查结果") - public R last(@PathVariable String registerId, @PathVariable String projectId) { - ScreeningRecordVo screeningRecordVo = screeningRecordService.last(registerId, projectId); + public R last(@PathVariable String patientId, @PathVariable String projectId) { + ScreeningRecordVo screeningRecordVo = screeningRecordService.last(patientId, projectId); return R.ok(screeningRecordVo); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java index 9a56d52..9f557d8 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningrecord/ScreeningRecordController.java @@ -59,23 +59,23 @@ public class ScreeningRecordController extends BaseController { return R.ok(screeningRecordService.detail(screeningId)); } - @GetMapping("/getScreening/{registerId}") + @GetMapping("/getScreening/{patientId}") @ApiOperation(value = "获取当前预约信息") - public R getScreeningByRegisterId(@PathVariable String registerId) { - return R.ok(screeningRecordService.getScreeningByRegisterId(registerId)); + public R getScreeningByPatientId(@PathVariable String patientId) { + return R.ok(screeningRecordService.getScreeningByPatientId(patientId)); } - @GetMapping("/last/{registerId}") + @GetMapping("/last/{patientId}") @ApiOperation(value = "获取最新一次筛查结果") - public R last(@PathVariable String registerId) { - return R.ok(screeningRecordService.last(registerId,null)); + public R last(@PathVariable String patientId) { + return R.ok(screeningRecordService.last(patientId,null)); } - @GetMapping("/timelineList/{registerId}") + @GetMapping("/timelineList/{patientId}") @ApiOperation(value = "根据居民业务主键查询筛查记录时间轴", response = TimelineVo.class, notes = "根据居民业务主键查询筛查记录时间轴", httpMethod = "GET") - @ApiImplicitParam(name = "registerId", value = "居民业务主键", required = true, dataTypeClass = String.class) - public R> TimelineList(@PathVariable("registerId") String registerId) { - return R.ok(screeningRecordService.getTimelineList(registerId)); + @ApiImplicitParam(name = "patientId", value = "居民业务主键", required = true, dataTypeClass = String.class) + public R> TimelineList(@PathVariable("patientId") String patientId) { + return R.ok(screeningRecordService.getTimelineList(patientId)); } @GetMapping("/receive/{screeningId}") @@ -109,7 +109,7 @@ public class ScreeningRecordController extends BaseController { @RepeatSubmit(interval = 2000, message = "请求过于频繁") public R pushScreening(@RequestBody ScreeningRecordSaveDTO body) { try { - if (StringUtils.isBlank(body.getRegisterId())) { + if (StringUtils.isBlank(body.getPatientId())) { return R.fail("请选择居民！"); } if (CollectionUtils.isEmpty(body.getProjectList())) { diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningApplyDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningApplyDTO.java index e7f0f81..2da296b 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningApplyDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningApplyDTO.java @@ -22,7 +22,7 @@ public class ScreeningApplyDTO implements Serializable { * 居民业务主键 */ @ApiModelProperty(value = "居民业务主键") - private String registerId; + private String patientId; @ApiModelProperty(value = "居民身份证号") private String identity; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordApplyDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordApplyDTO.java index eb4b776..4797159 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordApplyDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordApplyDTO.java @@ -28,7 +28,7 @@ public class ScreeningRecordApplyDTO implements Serializable { * 居民业务主键 */ @ApiModelProperty(value = "居民业务主键", required = true) - private String registerId; + private String patientId; /** * 居民姓名 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordDTO.java index 26f50d9..43926f7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordDTO.java @@ -22,7 +22,7 @@ public class ScreeningRecordDTO extends BaseEntity { * 居民业务主键 */ @ApiModelProperty(value = "居民业务主键") - private String registerId; + private String patientId; /** * 居民姓名 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordSaveDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordSaveDTO.java index 00971d0..db4d841 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordSaveDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/screeningrecord/ScreeningRecordSaveDTO.java @@ -16,7 +16,7 @@ import lombok.Data; public class ScreeningRecordSaveDTO { @ApiModelProperty("居民业务主键") - private String registerId; + private String patientId; @ApiModelProperty("筛查项目列表") private List projectList; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningrecord/ScreeningRecordMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningrecord/ScreeningRecordMapper.java index 6948a6f..98ae77e 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningrecord/ScreeningRecordMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningrecord/ScreeningRecordMapper.java @@ -57,10 +57,10 @@ public interface ScreeningRecordMapper { * @Author mengkuiliang * @Description 获取当前居民预约信息 * @Date 2023-01-29 14:51 - * @Param [registerId] + * @Param [patientId] * @return com.disease.business.domain.vo.ScreeningRecordVo **/ - ScreeningRecordVo getScreeningByRegisterId(String registerId); + ScreeningRecordVo getScreeningByPatientId(String patientId); /** * @Author mengkuiliang @@ -84,14 +84,14 @@ public interface ScreeningRecordMapper { * @Author mengkuiliang * @Description 获取最新一次筛查结果 * @Date 2023-01-30 13:07 - * @Param [registerId] + * @Param [patientId] * @return com.disease.business.domain.vo.ScreeningRecordVo **/ - ScreeningRecordVo getScreeningOfLast(@Param("registerId") String registerId, @Param("screeningStatus")String screeningStatus, @Param("screeningType") String screeningType, @Param("projectId") String projectId); + ScreeningRecordVo getScreeningOfLast(@Param("patientId") String patientId, @Param("screeningStatus")String screeningStatus, @Param("screeningType") String screeningType, @Param("projectId") String projectId); ScreeningRecord selectByScreeningId(String screeningId); - List selectTimeLineList(@Param("registerId") String registerId); + List selectTimeLineList(@Param("patientId") String patientId); List screeningList(ScreeningRecordDTO query); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java index 1bf4172..1af4a80 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/IScreeningRecordService.java @@ -98,25 +98,25 @@ public interface IScreeningRecordService { * @Param * @return **/ - ScreeningRecordVo getScreeningByRegisterId(String registerId); + ScreeningRecordVo getScreeningByPatientId(String patientId); /** * @Author mengkuiliang * @Description 获取最新一次筛查结果 * @Date 2023-01-30 11:45 - * @Param [registerId] + * @Param [patientId] * @return void **/ - ScreeningRecordVo last(String registerId,String projectId); + ScreeningRecordVo last(String patientId,String projectId); /** * @Author haown * @Description 获取居民筛查记录时间轴 * @Date 2023-02-06 20:49 - * @Param [registerId] + * @Param [patientId] * @return void **/ - List getTimelineList(String registerId); + List getTimelineList(String patientId); Integer pushScreening(ScreeningRecordSaveDTO body) throws Exception; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java index 2fbd082..4f75d06 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java @@ -96,7 +96,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { } // 查询 同一机构的同一筛查项目在同一天是否有预约 ScreeningRecordDTO query = new ScreeningRecordDTO(); - query.setRegisterId(body.getRegisterId()); + query.setPatientId(body.getPatientId()); query.setDeptId(body.getDeptId()); query.setProjectId(body.getProjectId()); query.setApplyStartDate(body.getApplyStartTime()); @@ -131,7 +131,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { // .fluentPut("contentId", recordBody.getScreeningId()); //FdmpPushMegUtil.sendPost(jsonObject); } - return body.getRegisterId(); + return body.getPatientId(); } @Override @@ -144,7 +144,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { int flag = screeningRecordMapper.update(body); if (flag > 0) { // TODO 推送提醒 - //PatientInfoVO patientInfoVO = patientService.selectPatientInfoById(body.getRegisterId()); + //PatientInfoVO patientInfoVO = patientService.selectPatientInfoById(body.getPatientId()); //JSONObject jsonObject = new JSONObject(); //jsonObject.fluentPut("senderNo", SecurityUtils.getUserId()) // .fluentPut("senderName", SecurityUtils.getLoginUser().getUser().getNickName()) @@ -241,8 +241,8 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { * @return com.disease.business.domain.vo.ScreeningRecordVo **/ @Override - public ScreeningRecordVo getScreeningByRegisterId(String registerId) { - ScreeningRecordVo recordVo = screeningRecordMapper.getScreeningByRegisterId(registerId); + public ScreeningRecordVo getScreeningByPatientId(String patientId) { + ScreeningRecordVo recordVo = screeningRecordMapper.getScreeningByPatientId(patientId); if(recordVo == null) { return null; } @@ -254,12 +254,12 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { * @Author mengkuiliang * @Description 获取最新一次筛查结果 * @Date 2023-01-30 11:46 - * @Param [registerId] + * @Param [patientId] * @return com.disease.business.domain.vo.ProjectRecordVo **/ @Override - public ScreeningRecordVo last(String registerId,String projectId) { - ScreeningRecordVo recordVo = screeningRecordMapper.getScreeningOfLast(registerId, null, "1",projectId); + public ScreeningRecordVo last(String patientId,String projectId) { + ScreeningRecordVo recordVo = screeningRecordMapper.getScreeningOfLast(patientId, null, "1",projectId); if(recordVo == null) { return null; } @@ -275,8 +275,8 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { return recordVo; } - @Override public List getTimelineList(String registerId) { - List timelineVos = screeningRecordMapper.selectTimeLineList(registerId); + @Override public List getTimelineList(String patientId) { + List timelineVos = screeningRecordMapper.selectTimeLineList(patientId); // 按照年份进行分组 Map> groupByTime = timelineVos.stream().collect(Collectors.groupingBy(item-> DateUtils.formatDate(item.getCreateTime(), "yyyy"))); List timeList = new ArrayList<>(); @@ -304,7 +304,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { String assessRecordId = ""; // 查询居民最新一次评估记录 - //List riskAssessRecords = riskAssessRecordMapper.selectByPatientId(body.getRegisterId()); + //List riskAssessRecords = riskAssessRecordMapper.selectByPatientId(body.getPatientId()); //if (riskAssessRecords != null && riskAssessRecords.size() > 0) { // RiskAssessRecord riskAssessRecord = riskAssessRecords.get(riskAssessRecords.size() - 1); // if (riskAssessRecord != null) { @@ -319,7 +319,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { screeningRecord.setScreeningId(IdUtils.fastSimpleUUID()); screeningRecord.setProjectId(project.getProjectId()); screeningRecord.setProjectName(project.getProjectName()); - screeningRecord.setRegisterId(body.getRegisterId()); + screeningRecord.setPatientId(body.getPatientId()); // TODO 用户id //screeningRecord.setDoctorId(SecurityUtils.getUserId()); screeningRecord.setDoctorName(SecurityUtils.getLoginUser().getUser().getNickName()); @@ -334,7 +334,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { if (flag > 0) { // TODO 推送消息通知 //JSONObject jsonObject = new JSONObject(); - //RegisterVo register = registerService.getByRegisterId(body.getRegisterId()); + //RegisterVo register = registerService.getByPatientId(body.getPatientId()); //jsonObject.fluentPut("senderNo", SecurityUtils.getUserId()) // .fluentPut("senderName", SecurityUtils.getLoginUser().getUser().getNickName()) // .fluentPut("doctorName", SecurityUtils.getLoginUser().getUser().getNickName()) @@ -362,7 +362,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { retObject.fluentPut("projectName", String.join("," , projectName)) .fluentPut("doctorName", screeningRecordVoList.get(0).getDoctorName()); // TODO 居民信息 - //PatientInfoVO patientInfoVO = patientService.selectPatientInfoById(screeningRecordVoList.get(0).getRegisterId()); + //PatientInfoVO patientInfoVO = patientService.selectPatientInfoById(screeningRecordVoList.get(0).getPatientId()); //retObject.fluentPut("name", patientInfoVO.getPatientName()); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/screeningrecord/ScreeningRecordVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/screeningrecord/ScreeningRecordVo.java index e694760..879aa21 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/screeningrecord/ScreeningRecordVo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/screeningrecord/ScreeningRecordVo.java @@ -32,13 +32,13 @@ public class ScreeningRecordVo { * 居民业务主键 */ @ApiModelProperty("居民业务主键") - private String registerId; + private String patientId; /** * 居民姓名 */ @ApiModelProperty("居民姓名") - private String residentName; + private String patientName; /** * 性别（1：男 2：女）