From 7b072d2a5127b0d982d433d6b1a60666820d2ded Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 22 Sep 2023 15:27:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add=3D=3D=3D>:=E5=A2=9E=E5=8A=A0=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E6=8E=92=E7=8F=AD=E7=8F=AD=E6=AC=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppletSchedulePlanController.java | 16 +++ .../schedule/ScheduleController.java | 51 ++++++++- .../scheduleplan/SchedulePlanController.java | 24 ++++ .../manage/domain/schedule/Schedule.java | 33 ++++-- .../domain/scheduleplan/SchedulePlan.java | 16 ++- .../SchedulePlanDetail.java | 9 +- .../screeningrecord/ScreeningRecord.java | 4 +- .../dto/scheduleplan/SchedulePlanSaveDTO.java | 13 +++ .../mapper/schedule/ScheduleMapper.java | 7 +- .../scheduleplan/SchedulePlanMapper.java | 6 +- .../SchedulePlanDetailMapper.java | 3 + .../service/schedule/IScheduleService.java | 20 ++++ .../service/schedule/ScheduleService.java | 10 -- .../schedule/impl/ScheduleServiceImpl.java | 39 ++++++- .../scheduleplan/ISchedulePlanService.java | 18 +++ .../scheduleplan/SchedulePlanService.java | 10 -- .../impl/SchedulePlanServiceImpl.java | 104 +++++++++++++++++- ...e.java => ISchedulePlanDetailService.java} | 6 +- .../impl/SchedulePlanDetailServiceImpl.java | 13 ++- .../mapper/manage/schedule/ScheduleMapper.xml | 49 +++++++-- .../scheduleplan/SchedulePlanMapper.xml | 51 +++++++-- .../SchedulePlanDetailMapper.xml | 12 ++ .../screeningrecord/ScreeningRecordMapper.xml | 26 ++--- 23 files changed, 457 insertions(+), 83 deletions(-) create mode 100644 xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletSchedulePlan/AppletSchedulePlanController.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplan/SchedulePlanController.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/scheduleplan/SchedulePlanSaveDTO.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/IScheduleService.java delete mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/ScheduleService.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/ISchedulePlanService.java delete mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/SchedulePlanService.java rename xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/{SchedulePlanDetailService.java => ISchedulePlanDetailService.java} (57%) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletSchedulePlan/AppletSchedulePlanController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletSchedulePlan/AppletSchedulePlanController.java new file mode 100644 index 0000000..bfd2b25 --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletSchedulePlan/AppletSchedulePlanController.java @@ -0,0 +1,16 @@ +package com.xinelu.applet.controller.appletSchedulePlan; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 小程序医生排班计划控制器 + * @author: haown + * @create: 2023-09-22 10:28 + **/ +@Api(tags = "小程序医生排班计划控制器") +@RestController +@RequestMapping("/nurseApplet/schedule/plan") +public class AppletSchedulePlanController { +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/schedule/ScheduleController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/schedule/ScheduleController.java index cdade48..802fd95 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/schedule/ScheduleController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/schedule/ScheduleController.java @@ -1,6 +1,19 @@ package com.xinelu.manage.controller.schedule; -import io.swagger.annotations.ApiModel; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.R; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.manage.domain.schedule.Schedule; +import com.xinelu.manage.service.schedule.IScheduleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -9,10 +22,42 @@ import org.springframework.web.bind.annotation.RestController; * @author: haown * @create: 2023-09-21 17:25 **/ -@ApiModel(value = "排班班次控制器") +@Api(tags = "排班班次控制器") @RestController @RequestMapping("/system/schedule") -public class ScheduleController { +public class ScheduleController extends BaseController { + @Resource + private IScheduleService scheduleService; + /** + * 查询班次列表 + */ + @ApiOperation("查询班次列表") + @GetMapping("/list") + public TableDataInfo list(Schedule schedule) { + startPage(); + List list = scheduleService.getList(schedule); + return getDataTable(list); + } + + @ApiOperation("新增班次") + @PostMapping("add") + public R add(@RequestBody Schedule schedule) { + return scheduleService.save(schedule) > 0 ? R.ok() : R.fail("保存失败"); + } + + @ApiOperation("修改班次") + @PostMapping("update") + public R update(@RequestBody Schedule schedule) { + return scheduleService.update(schedule) < 0 ? R.fail("修改失败") : R.ok(); + } + + @ApiOperation("逻辑删除班次") + @PostMapping("delete/{id}") + @ApiImplicitParam(name = "id", value = "班次主键", required = true, dataTypeClass = String.class) + public R delete(@PathVariable Long id) { + scheduleService.delete(id); + return R.ok(); + } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplan/SchedulePlanController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplan/SchedulePlanController.java new file mode 100644 index 0000000..63bea07 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplan/SchedulePlanController.java @@ -0,0 +1,24 @@ +package com.xinelu.manage.controller.scheduleplan; + +import com.xinelu.manage.service.scheduleplan.ISchedulePlanService; +import io.swagger.annotations.Api; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 医生排班计划控制器 + * @author: haown + * @create: 2023-09-22 10:14 + **/ +@Api(tags = "医生排班计划控制器") +@RestController +@RequestMapping("/system/schedule/plan") +public class SchedulePlanController { + + @Resource + private ISchedulePlanService schedulePlanService; + + + +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/schedule/Schedule.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/schedule/Schedule.java index 317f336..42c9212 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/schedule/Schedule.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/schedule/Schedule.java @@ -1,9 +1,8 @@ package com.xinelu.manage.domain.schedule; -import com.xinelu.common.core.domain.BaseDomain; -import io.swagger.annotations.ApiModel; -import java.io.Serializable; -import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.core.domain.BaseEntity; +import java.time.LocalTime; import lombok.Data; /** @@ -11,8 +10,7 @@ import lombok.Data; * @TableName schedule */ @Data -@ApiModel(value = "排班表对象", description = "schedule") -public class Schedule extends BaseDomain implements Serializable { +public class Schedule extends BaseEntity { /** * 主键 */ @@ -36,22 +34,37 @@ public class Schedule extends BaseDomain implements Serializable { /** * 班次上午开始时间 */ - private Date forenoonStartTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") + private LocalTime forenoonStartTime; /** * 班次上午结束时间 */ - private Date forenoonEndTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") + private LocalTime forenoonEndTime; /** * 班次下午开始时间 */ - private Date afternoonStartTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") + private LocalTime afternoonStartTime; /** * 班次下午结束时间 */ - private Date afternoonEndTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") + private LocalTime afternoonEndTime; + + /** + * 启用状态（0正常 1停用） + */ + private String status; + + /** + * 删除标志（0代表存在 1代表删除） + */ + private String delFlag; private static final long serialVersionUID = 1L; + } \ No newline at end of file diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplan/SchedulePlan.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplan/SchedulePlan.java index 3905f9e..28fd8a1 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplan/SchedulePlan.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplan/SchedulePlan.java @@ -1,7 +1,7 @@ package com.xinelu.manage.domain.scheduleplan; import com.xinelu.common.core.domain.BaseEntity; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -58,12 +58,12 @@ public class SchedulePlan extends BaseEntity { /** * 排班开始日期 */ - private Date scheduleStartDate; + private LocalDate scheduleStartDate; /** * 排班结束日期 */ - private Date scheduleEndDate; + private LocalDate scheduleEndDate; /** * 每人可预约分钟数 @@ -80,6 +80,16 @@ public class SchedulePlan extends BaseEntity { */ private String scheduleAddress; + /** + * 启用状态（0正常 1停用） + */ + private String status; + + /** + * 删除标志（0代表存在 1代表删除） + */ + private String delFlag; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java index 8896c2e..00843ea 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java @@ -1,7 +1,8 @@ package com.xinelu.manage.domain.scheduleplandetail; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalTime; import lombok.Data; /** @@ -33,17 +34,17 @@ public class SchedulePlanDetail implements Serializable { /** * 排班日期 */ - private Date scheduleDate; + private LocalDate scheduleDate; /** * 开始时间 */ - private Date scheduleStartTime; + private LocalTime scheduleStartTime; /** * 结束时间 */ - private Date scheduleEndTime; + private LocalTime scheduleEndTime; /** * 预约状态（0:未预约，1：已预约） diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningrecord/ScreeningRecord.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningrecord/ScreeningRecord.java index 1cc02cf..d1e9a1f 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningrecord/ScreeningRecord.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningrecord/ScreeningRecord.java @@ -26,13 +26,13 @@ public class ScreeningRecord implements Serializable { * 居民业务主键 */ @ApiModelProperty("居民业务主键") - private String registerId; + private String patientId; /** * 居民姓名 */ @ApiModelProperty("居民姓名") - private String residentName; + private String patientName; /** * 状态（1：已预约 2：取消预约 3：已登记 4：已完成） diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/scheduleplan/SchedulePlanSaveDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/scheduleplan/SchedulePlanSaveDTO.java new file mode 100644 index 0000000..8ebfb02 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/scheduleplan/SchedulePlanSaveDTO.java @@ -0,0 +1,13 @@ +package com.xinelu.manage.dto.scheduleplan; + +import io.swagger.annotations.ApiModel; + +/** + * @description: 医生排班计划保存传输对象 + * @author: haown + * @create: 2023-09-22 10:32 + **/ +@ApiModel("医生排班计划保存传输对象") +public class SchedulePlanSaveDTO { + +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/schedule/ScheduleMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/schedule/ScheduleMapper.java index 898d2ae..e5a48d1 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/schedule/ScheduleMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/schedule/ScheduleMapper.java @@ -1,11 +1,12 @@ package com.xinelu.manage.mapper.schedule; import com.xinelu.manage.domain.schedule.Schedule; +import java.util.List; /** -* @author Administrator +* @author haown * @description 针对表【schedule(排班班次表)】的数据库操作Mapper -* @createDate 2023-09-21 10:16:44 +* @createDate 2023-09-22 09:43:30 * @Entity com.xinelu.manage.domain.schedule.Schedule */ public interface ScheduleMapper { @@ -22,4 +23,6 @@ public interface ScheduleMapper { int updateByPrimaryKey(Schedule record); + List getList(Schedule schedule); + } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplan/SchedulePlanMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplan/SchedulePlanMapper.java index 4b3b36d..d4c8561 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplan/SchedulePlanMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplan/SchedulePlanMapper.java @@ -1,11 +1,12 @@ package com.xinelu.manage.mapper.scheduleplan; import com.xinelu.manage.domain.scheduleplan.SchedulePlan; +import java.util.List; /** -* @author haown +* @author Administrator * @description 针对表【schedule_plan(医生排班计划表)】的数据库操作Mapper -* @createDate 2023-09-21 17:17:23 +* @createDate 2023-09-22 09:45:24 * @Entity com.xinelu.manage.domain.scheduleplan.SchedulePlan */ public interface SchedulePlanMapper { @@ -22,4 +23,5 @@ public interface SchedulePlanMapper { int updateByPrimaryKey(SchedulePlan record); + List getList(SchedulePlan record); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplandetail/SchedulePlanDetailMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplandetail/SchedulePlanDetailMapper.java index fcf3c37..b9e72c7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplandetail/SchedulePlanDetailMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/scheduleplandetail/SchedulePlanDetailMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.scheduleplandetail; import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; +import java.util.List; /** * @author haown @@ -22,4 +23,6 @@ public interface SchedulePlanDetailMapper { int updateByPrimaryKey(SchedulePlanDetail record); + int batchInsert(List record); + } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/IScheduleService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/IScheduleService.java new file mode 100644 index 0000000..74e5402 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/IScheduleService.java @@ -0,0 +1,20 @@ +package com.xinelu.manage.service.schedule; + +import com.xinelu.manage.domain.schedule.Schedule; +import java.util.List; + +/** +* @author haown +* @description 针对表【schedule(排班班次表)】的数据库操作Service +* @createDate 2023-09-21 10:12:22 +*/ +public interface IScheduleService { + + int save(Schedule schedule); + + int update(Schedule schedule); + + int delete(long id); + + List getList(Schedule schedule); +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/ScheduleService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/ScheduleService.java deleted file mode 100644 index 8cd3a53..0000000 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/ScheduleService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.manage.service.schedule; - -/** -* @author haown -* @description 针对表【schedule(排班班次表)】的数据库操作Service -* @createDate 2023-09-21 10:12:22 -*/ -public interface ScheduleService { - -} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/impl/ScheduleServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/impl/ScheduleServiceImpl.java index 0f951d1..bd7234d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/impl/ScheduleServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/schedule/impl/ScheduleServiceImpl.java @@ -1,16 +1,49 @@ package com.xinelu.manage.service.schedule.impl; -import com.xinelu.manage.service.schedule.ScheduleService; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.manage.domain.schedule.Schedule; +import com.xinelu.manage.mapper.schedule.ScheduleMapper; +import com.xinelu.manage.service.schedule.IScheduleService; +import java.util.Date; +import java.util.List; +import javax.annotation.Resource; import org.springframework.stereotype.Service; /** -* @author Administrator +* @author haown * @description 针对表【schedule(排班班次表)】的数据库操作Service实现 * @createDate 2023-09-21 10:12:22 */ @Service -public class ScheduleServiceImpl implements ScheduleService { +public class ScheduleServiceImpl implements IScheduleService { + @Resource + private ScheduleMapper scheduleMapper; + + @Override public int save(Schedule schedule) { + schedule.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + schedule.setCreateTime(new Date()); + return scheduleMapper.insertSelective(schedule); + } + + @Override public int update(Schedule schedule) { + schedule.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + schedule.setUpdateTime(new Date()); + return scheduleMapper.updateByPrimaryKeySelective(schedule); + } + + @Override public int delete(long id) { + Schedule schedule = new Schedule(); + schedule.setId(id); + schedule.setDelFlag("1"); + schedule.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + schedule.setUpdateTime(new Date()); + return scheduleMapper.updateByPrimaryKeySelective(schedule); + } + + @Override public List getList(Schedule schedule) { + return scheduleMapper.getList(schedule); + } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/ISchedulePlanService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/ISchedulePlanService.java new file mode 100644 index 0000000..d7c52a0 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/ISchedulePlanService.java @@ -0,0 +1,18 @@ +package com.xinelu.manage.service.scheduleplan; + +import com.xinelu.manage.domain.scheduleplan.SchedulePlan; +import java.util.List; + +/** +* @author haown +* @description 针对表【schedule_plan(医生排班计划表)】的数据库操作Service +* @createDate 2023-09-21 17:16:40 +*/ +public interface ISchedulePlanService { + + List getList(SchedulePlan schedulePlan); + + int save(SchedulePlan schedulePlan) throws Exception; + + +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/SchedulePlanService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/SchedulePlanService.java deleted file mode 100644 index ef4dec8..0000000 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/SchedulePlanService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.xinelu.manage.service.scheduleplan; - -/** -* @author haown -* @description 针对表【schedule_plan(医生排班计划表)】的数据库操作Service -* @createDate 2023-09-21 17:16:40 -*/ -public interface SchedulePlanService { - -} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/impl/SchedulePlanServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/impl/SchedulePlanServiceImpl.java index 9ef331f..192c75e 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/impl/SchedulePlanServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplan/impl/SchedulePlanServiceImpl.java @@ -1,7 +1,21 @@ package com.xinelu.manage.service.scheduleplan.impl; -import com.xinelu.manage.service.scheduleplan.SchedulePlanService; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.manage.domain.schedule.Schedule; +import com.xinelu.manage.domain.scheduleplan.SchedulePlan; +import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; +import com.xinelu.manage.mapper.schedule.ScheduleMapper; +import com.xinelu.manage.mapper.scheduleplan.SchedulePlanMapper; +import com.xinelu.manage.mapper.scheduleplandetail.SchedulePlanDetailMapper; +import com.xinelu.manage.service.scheduleplan.ISchedulePlanService; +import java.time.LocalTime; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.List; +import javax.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author haown @@ -9,8 +23,94 @@ import org.springframework.stereotype.Service; * @createDate 2023-09-21 17:16:40 */ @Service -public class SchedulePlanServiceImpl implements SchedulePlanService{ +public class SchedulePlanServiceImpl implements ISchedulePlanService { + @Resource + private SchedulePlanMapper schedulePlanMapper; + + @Resource + private ScheduleMapper scheduleMapper; + + @Resource + private SchedulePlanDetailMapper planDetailMapper; + + @Override public List getList(SchedulePlan schedulePlan) { + return schedulePlanMapper.getList(schedulePlan); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int save(SchedulePlan schedulePlan) throws Exception { + // 保存排班计划 + schedulePlan.setDelFlag("0"); + if (StringUtils.isBlank(schedulePlan.getStatus())) { + schedulePlan.setStatus("1"); + } + int flag = schedulePlanMapper.insert(schedulePlan); + + Schedule schedule = scheduleMapper.selectByPrimaryKey(schedulePlan.getScheduleId()); + if (flag > 0) { + // 计算排班天数 + long days = ChronoUnit.DAYS.between(schedulePlan.getScheduleStartDate(), schedulePlan.getScheduleEndDate()); + for (int i = 0; i <= days; i++) { + int patientsPerDay = 0; + // 排班计划明细 + List detailList = new ArrayList<>(); + SchedulePlanDetail schedulePlanDetail = new SchedulePlanDetail(); + schedulePlanDetail.setSchedulePlanId(schedulePlan.getId()); + schedulePlanDetail.setScheduleDate(schedulePlan.getScheduleStartDate().plusDays(i)); + // 生成上午计划 + if (schedule.getForenoonStartTime() != null && schedule.getForenoonEndTime() != null) { + // 根据时间间隔计算时间段 + long forenoonMinutes = ChronoUnit.MINUTES.between(schedule.getForenoonStartTime(), schedule.getForenoonEndTime()); + if (forenoonMinutes % schedulePlan.getMinutesPerPatient() == 0) { + int number = (int) (forenoonMinutes / schedulePlan.getMinutesPerPatient()); + patientsPerDay += forenoonMinutes / schedulePlan.getMinutesPerPatient(); + detailList.addAll(genPlanDetail(schedulePlanDetail, number, schedule.getForenoonStartTime(), schedulePlan.getMinutesPerPatient())); + } else { + throw new Exception("上午上班时间不是每人可预约分钟数的倍数。"); + } + } + // 生成下午计划 + if (schedule.getAfternoonStartTime() != null && schedule.getAfternoonEndTime() != null) { + // 根据时间间隔计算时间段 + long afternoonMinutes = ChronoUnit.MINUTES.between(schedule.getAfternoonStartTime(), schedule.getAfternoonEndTime()); + if (afternoonMinutes % schedulePlan.getMinutesPerPatient() == 0) { + int number = (int) (afternoonMinutes / schedulePlan.getMinutesPerPatient()); + patientsPerDay += afternoonMinutes / schedulePlan.getMinutesPerPatient(); + detailList.addAll(genPlanDetail(schedulePlanDetail, number, schedule.getAfternoonStartTime(), schedulePlan.getMinutesPerPatient())); + } else { + throw new Exception("上午上班时间不是每人可预约分钟数的倍数。"); + } + } + + // 保存计划明细 + planDetailMapper.batchInsert(detailList); + schedulePlan.setPatientsPerDay(patientsPerDay); + schedulePlanMapper.updateByPrimaryKey(schedulePlan); + } + } + return flag; + } + + /** + * 生成计划明细 + * @param number：人数 + * @param startTime：开始时间 + * @return + */ + private List genPlanDetail(SchedulePlanDetail schedulePlanDetail, int number, LocalTime startTime, int minutesPerPatient) { + List planDetails = new ArrayList<>(); + for (int i = 0; i < number; i++) { + SchedulePlanDetail planDetail = new SchedulePlanDetail(); + BeanUtils.copyBeanProp(planDetail, schedulePlanDetail); + planDetail.setScheduleStartTime(startTime.plusMinutes((long) minutesPerPatient * i)); + planDetail.setScheduleEndTime(startTime.plusMinutes((long) minutesPerPatient * (i + 1))); + planDetail.setApplyState("0"); + planDetails.add(planDetail); + } + return planDetails; + } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/SchedulePlanDetailService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java similarity index 57% rename from xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/SchedulePlanDetailService.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java index 3bf46b5..dc3810e 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/SchedulePlanDetailService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java @@ -1,10 +1,14 @@ package com.xinelu.manage.service.scheduleplandetail; +import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; + /** * @author haown * @description 针对表【schedule_plan_detail(医生排班计划明细表)】的数据库操作Service * @createDate 2023-09-21 17:21:38 */ -public interface SchedulePlanDetailService { +public interface ISchedulePlanDetailService { + + int save(SchedulePlanDetail planDetail); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/impl/SchedulePlanDetailServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/impl/SchedulePlanDetailServiceImpl.java index f71e778..d0ddbcc 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/impl/SchedulePlanDetailServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/impl/SchedulePlanDetailServiceImpl.java @@ -1,6 +1,9 @@ package com.xinelu.manage.service.scheduleplandetail.impl; -import com.xinelu.manage.service.scheduleplandetail.SchedulePlanDetailService; +import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; +import com.xinelu.manage.mapper.scheduleplandetail.SchedulePlanDetailMapper; +import com.xinelu.manage.service.scheduleplandetail.ISchedulePlanDetailService; +import javax.annotation.Resource; import org.springframework.stereotype.Service; /** @@ -9,8 +12,14 @@ import org.springframework.stereotype.Service; * @createDate 2023-09-21 17:21:38 */ @Service -public class SchedulePlanDetailServiceImpl implements SchedulePlanDetailService{ +public class SchedulePlanDetailServiceImpl implements ISchedulePlanDetailService { + @Resource + private SchedulePlanDetailMapper planDetailMapper; + + @Override public int save(SchedulePlanDetail planDetail) { + return planDetailMapper.insert(planDetail); + } } diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/schedule/ScheduleMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/schedule/ScheduleMapper.xml index e5e56ee..8bc22ab 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/schedule/ScheduleMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/schedule/ScheduleMapper.xml @@ -13,6 +13,8 @@ + + @@ -22,8 +24,9 @@ id,hospital_id,hospital_name, schedule_name,forenoon_start_time,forenoon_end_time, - afternoon_start_time,afternoon_end_time,create_by, - create_time,update_by,update_time + afternoon_start_time,afternoon_end_time,status, + del_flag,create_by,create_time, + update_by,update_time + select + + from schedule + + del_flag = '0' + + and hospital_id = #{hospitalId,jdbcType=BIGINT} + + + and hospital_name like concat('%', #{hospitalName}, '%') + + + and schedule_name like concat('%', #{scheduleName}, '%') + + + diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplan/SchedulePlanMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplan/SchedulePlanMapper.xml index d2b9267..aff14fb 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplan/SchedulePlanMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplan/SchedulePlanMapper.xml @@ -19,6 +19,8 @@ + + @@ -30,8 +32,9 @@ department_id,department_name,schedule_id, schedule_name,doctor_id,doctor_name, schedule_start_date,schedule_end_date,minutes_per_patient, - patients_per_day,schedule_address,create_by, - create_time,update_by,update_time + patients_per_day,schedule_address,status, + del_flag,create_by,create_time, + update_by,update_time + select + + from schedule_plan + + del_flag = '0' + + and hospital_id = #{hospitalId,jdbcType=BIGINT} + + + and department_id = #{departmentId,jdbcType=BIGINT} + + + and schedule_id = #{scheduleId,jdbcType=BIGINT} + + + and doctor_id = #{doctorId,jdbcType=BIGINT} + + + diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml index db19e6d..e8e3109 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml @@ -103,4 +103,16 @@ apply_state = #{applyState,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} + + insert into schedule_plan_detail + (schedule_plan_id,doctor_id + ,doctor_name,schedule_date,schedule_start_time + ,schedule_end_time,apply_state) values + + (#{schedulePlanId,jdbcType=BIGINT},#{doctorId,jdbcType=BIGINT} + ,#{doctorName,jdbcType=VARCHAR},#{scheduleDate,jdbcType=DATE},#{scheduleStartTime,jdbcType=TIME} + ,#{scheduleEndTime,jdbcType=TIME},#{applyState,jdbcType=VARCHAR}) + + + diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningrecord/ScreeningRecordMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningrecord/ScreeningRecordMapper.xml index 31b20ef..307bdbc 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningrecord/ScreeningRecordMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningrecord/ScreeningRecordMapper.xml @@ -7,7 +7,7 @@ - + @@ -35,7 +35,7 @@ - id,screening_id,register_id,screening_status, + id,screening_id,patient_id,screening_status, disease,dept_id,IFNULL(dept_name, '') as dept_name, project_id, project_name, apply_start_time,apply_end_time, screening_date, @@ -45,7 +45,7 @@ - screening_id,register_id,screening_status, + screening_id,patient_id,screening_status, disease,dept_id,dept_name, project_id, project_name, apply_start_time, apply_end_time, screening_date, @@ -56,7 +56,7 @@ insert into sd_screening_record () - values (#{screeningId}, #{registerId}, #{screeningStatus}, + values (#{screeningId}, #{patientId}, #{screeningStatus}, #{disease}, #{deptId}, #{deptName}, #{projectId},#{projectName}, #{applyStartTime}, #{applyEndTime},#{screeningDate}, @@ -156,9 +156,9 @@ - select from sd_screening_record - where register_id = #{registerId} and screening_status in ('1', '3') + where patient_id = #{patientId} and screening_status in ('1', '3') and screening_type = '1' limit 1 @@ -167,8 +167,8 @@ and screening_status = #{screeningStatus} - - and register_id = #{registerId} + + and patient_id = #{patientId} and resident_name like concat(#{residentName}, '%') @@ -215,7 +215,7 @@ - select ssr.id,ssr.screening_id,ssr.register_id,ssr.screening_status, + select ssr.id,ssr.screening_id,ssr.patient_id,ssr.screening_status, ssr.disease,ssr.dept_id,IFNULL(ssr.dept_name, '') as dept_name,ssr.project_id, ssr.project_name, ssr.apply_start_time,ssr.apply_end_time, ssr.screening_date,ssr.content,ssr.diagnostic_result,ssr.attachment,ssr.attachment_two, ssr.doctor_id,IFNULL(ssr.doctor_name,'') as doctor_name,ssr.apply_barcode,ssr.registration_date,ssr.screening_type,ssr.push_date,ssr.assess_record_id, @@ -332,7 +332,7 @@ From e9e3397c517ebda87f420a716ae8ffaa2312fab5 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 22 Sep 2023 15:36:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=3D=3D=3D>:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=B8=BB=E9=94=AE=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppletScreeningRecordController.java | 12 ++++---- .../ScreeningRecordController.java | 22 +++++++-------- .../screeningrecord/ScreeningApplyDTO.java | 2 +- .../ScreeningRecordApplyDTO.java | 2 +- .../screeningrecord/ScreeningRecordDTO.java | 2 +- .../ScreeningRecordSaveDTO.java | 2 +- .../ScreeningRecordMapper.java | 10 +++---- .../IScreeningRecordService.java | 10 +++---- .../impl/ScreeningRecordServiceImpl.java | 28 +++++++++---------- .../vo/screeningrecord/ScreeningRecordVo.java | 4 +-- 10 files changed, 47 insertions(+), 47 deletions(-) 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：女）