From e01e61954c67ed50b5e84e775778b16e54e44812 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 26 Sep 2023 14:27:40 +0800 Subject: [PATCH] =?UTF-8?q?update=3D=3D=3D>:=E5=8C=BB=E7=94=9F=E6=8E=92?= =?UTF-8?q?=E7=8F=AD=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xinelu-admin/pom.xml | 7 +++ .../xinelu/web/core/config/SwaggerConfig.java | 16 ++++-- .../HospitalDepartmentInfoController.java | 22 +++++++- .../hospitalinfo/HospitalInfoController.java | 20 +++++++ .../HospitalPersonInfoController.java | 23 +++++++- .../schedule/ScheduleController.java | 31 +++++++++-- .../scheduleplan/SchedulePlanController.java | 41 +++++++++++++- .../SchedulePlanDetailController.java | 34 ++++++++++++ .../manage/domain/schedule/Schedule.java | 10 ++++ .../domain/scheduleplan/SchedulePlan.java | 21 ++++++++ .../SchedulePlanDetail.java | 5 ++ .../ScreeningRecordApplyDTO.java | 2 +- .../screeningrecord/ScreeningRecordDTO.java | 2 +- .../HospitalPersonInfoMapper.java | 8 +++ .../SchedulePlanDetailMapper.java | 2 + .../IHospitalPersonInfoService.java | 3 ++ .../impl/HospitalPersonInfoServiceImpl.java | 6 ++- .../service/schedule/IScheduleService.java | 4 +- .../schedule/impl/ScheduleServiceImpl.java | 54 ++++++++++++++++++- .../impl/SchedulePlanServiceImpl.java | 8 ++- .../ISchedulePlanDetailService.java | 2 + .../impl/SchedulePlanDetailServiceImpl.java | 5 ++ .../impl/ScreeningRecordServiceImpl.java | 4 +- .../HospitalDepartmentInfoMapper.xml | 2 +- .../HospitalPersonInfoMapper.xml | 38 +++++++++++++ .../SchedulePlanDetailMapper.xml | 39 +++++++++++--- .../ScreeningProjectMapper.xml | 16 +++--- .../screeningrecord/ScreeningRecordMapper.xml | 32 +++++------ 28 files changed, 403 insertions(+), 54 deletions(-) create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplandetail/SchedulePlanDetailController.java diff --git a/xinelu-admin/pom.xml b/xinelu-admin/pom.xml index 86cb1d2..8cd561b 100644 --- a/xinelu-admin/pom.xml +++ b/xinelu-admin/pom.xml @@ -37,6 +37,13 @@ 1.6.2 + + + com.github.xiaoymin + knife4j-spring-boot-starter + 3.0.3 + + mysql diff --git a/xinelu-admin/src/main/java/com/xinelu/web/core/config/SwaggerConfig.java b/xinelu-admin/src/main/java/com/xinelu/web/core/config/SwaggerConfig.java index 9c4a044..b97ffc9 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/core/config/SwaggerConfig.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/core/config/SwaggerConfig.java @@ -1,8 +1,11 @@ package com.xinelu.web.core.config; +import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import com.xinelu.common.config.XinELuConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; +import java.util.ArrayList; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -10,13 +13,16 @@ import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.*; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.Contact; +import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.SecurityScheme; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; - -import java.util.ArrayList; -import java.util.List; +import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * Swagger2的接口配置 @@ -24,6 +30,8 @@ import java.util.List; * @author xinelu */ @Configuration +@EnableKnife4j +@EnableSwagger2 public class SwaggerConfig { /** * 系统基础配置 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitaldepartmentinfo/HospitalDepartmentInfoController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitaldepartmentinfo/HospitalDepartmentInfoController.java index 727b019..8538cf1 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitaldepartmentinfo/HospitalDepartmentInfoController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitaldepartmentinfo/HospitalDepartmentInfoController.java @@ -11,6 +11,8 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.dto.hospitaldepartmentinfo.HospitalDepartmentDTO; import com.xinelu.manage.domain.hospitaldepartmentinfo.HospitalDepartmentInfo; import com.xinelu.manage.service.hospitaldepartmentinfo.IHospitalDepartmentInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController; * @author zh * @date 2023-02-13 */ +@Api(tags = "科室信息管理控制器") @RestController @RequestMapping("/system/hospitalDepartment") public class HospitalDepartmentInfoController extends BaseController { @@ -37,8 +40,9 @@ public class HospitalDepartmentInfoController extends BaseController { private IHospitalDepartmentInfoService hospitalDepartmentInfoService; /** - * 查询科室信息管理列表 + * 查询科室信息管理分页列表 */ + @ApiOperation("查询科室信息管理分页列表") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:list')") @GetMapping("/list") public TableDataInfo list(HospitalDepartmentInfo hospitalDepartmentInfo) { @@ -47,9 +51,21 @@ public class HospitalDepartmentInfoController extends BaseController { return getDataTable(list); } + /** + * 查询科室信息管理列表 + */ + @ApiOperation("查询科室信息管理列表") + @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:list')") + @GetMapping("/getList") + public AjaxResult getList(HospitalDepartmentInfo hospitalDepartmentInfo) { + List list = hospitalDepartmentInfoService.selectHospitalDepartmentInfoList(hospitalDepartmentInfo); + return AjaxResult.success(list); + } + /** * 导出科室信息管理列表 */ + @ApiOperation("导出科室信息管理列表") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:export')") @Log(title = "科室信息管理", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -62,6 +78,7 @@ public class HospitalDepartmentInfoController extends BaseController { /** * 获取科室信息管理详细信息 */ + @ApiOperation("获取科室信息管理详细信息") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,6 +88,7 @@ public class HospitalDepartmentInfoController extends BaseController { /** * 新增科室信息管理 */ + @ApiOperation("新增科室信息管理") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:add')") @Log(title = "科室信息管理", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -81,6 +99,7 @@ public class HospitalDepartmentInfoController extends BaseController { /** * 修改科室信息管理 */ + @ApiOperation("修改科室信息管理") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:edit')") @Log(title = "科室信息管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @@ -91,6 +110,7 @@ public class HospitalDepartmentInfoController extends BaseController { /** * 删除科室信息管理 */ + @ApiOperation("删除科室信息管理") @PreAuthorize("@ss.hasPermi('system:hospitalDepartment:remove')") @Log(title = "科室信息管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalinfo/HospitalInfoController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalinfo/HospitalInfoController.java index be24b64..c821ec1 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalinfo/HospitalInfoController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalinfo/HospitalInfoController.java @@ -10,6 +10,8 @@ import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.hospitalinfo.HospitalInfo; import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -31,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController; * @author xinyilu * @date 2023-02-13 */ +@Api(tags = "医院信息管理控制器") @RestController @RequestMapping("/system/hospital") public class HospitalInfoController extends BaseController { @@ -40,6 +43,7 @@ public class HospitalInfoController extends BaseController { /** * 查询医院信息管理列表 */ + @ApiOperation("查询医院信息管理分页列表") @PreAuthorize("@ss.hasPermi('system:hospital:list')") @GetMapping("/list") public TableDataInfo list(HospitalInfo hospitalInfo) { @@ -48,9 +52,21 @@ public class HospitalInfoController extends BaseController { return getDataTable(list); } + /** + * 查询医院信息管理列表 + */ + @ApiOperation("查询医院信息管理列表") + @PreAuthorize("@ss.hasPermi('system:hospital:list')") + @GetMapping("/getList") + public AjaxResult getList(HospitalInfo hospitalInfo) { + List list = hospitalInfoService.selectHospitalInfoList(hospitalInfo); + return AjaxResult.success(list); + } + /** * 导出医院信息管理列表 */ + @ApiOperation("导出医院信息管理列表") @PreAuthorize("@ss.hasPermi('system:hospital:export')") @Log(title = "医院信息管理", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -63,6 +79,7 @@ public class HospitalInfoController extends BaseController { /** * 获取医院信息管理详细信息 */ + @ApiOperation("获取医院信息管理详细信息") @PreAuthorize("@ss.hasPermi('system:hospital:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,6 +89,7 @@ public class HospitalInfoController extends BaseController { /** * 新增医院信息管理 */ + @ApiOperation("新增医院信息管理") @PreAuthorize("@ss.hasPermi('system:hospital:add')") @Log(title = "医院信息管理", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -82,6 +100,7 @@ public class HospitalInfoController extends BaseController { /** * 修改医院信息管理 */ + @ApiOperation("修改医院信息管理") @PreAuthorize("@ss.hasPermi('system:hospital:edit')") @Log(title = "医院信息管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @@ -92,6 +111,7 @@ public class HospitalInfoController extends BaseController { /** * 删除医院信息管理 */ + @ApiOperation("修改医院信息管理") @PreAuthorize("@ss.hasPermi('system:hospital:remove')") @Log(title = "医院信息管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java index 6869cad..5165f48 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java @@ -8,9 +8,12 @@ import com.xinelu.common.custominterface.Insert; import com.xinelu.common.custominterface.Update; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; import com.xinelu.manage.dto.hospitalpersoninfo.HospitalPersonInfoDTO; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -30,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController; * @author xinyilu * @date 2023-02-14 */ +@Api(tags = "健康咨询-科室人员信息控制器") @RestController @RequestMapping("/system/hospitalPerson") public class HospitalPersonInfoController extends BaseController { @@ -37,8 +41,9 @@ public class HospitalPersonInfoController extends BaseController { private IHospitalPersonInfoService hospitalPersonInfoService; /** - * 查询健康咨询-科室人员信息列表 + * 查询健康咨询-科室人员信息分页列表 */ + @ApiOperation("查询健康咨询-科室人员信息分页列表") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:list')") @GetMapping("/list") public TableDataInfo list(HospitalPersonInfoVO hospitalPersonInfo) { @@ -47,9 +52,21 @@ public class HospitalPersonInfoController extends BaseController { return getDataTable(list); } + /** + * 查询健康咨询-科室人员信息列表 + */ + @ApiOperation("查询健康咨询-科室人员信息列表") + @PreAuthorize("@ss.hasPermi('system:hospitalPerson:list')") + @GetMapping("/getList") + public AjaxResult getList(HospitalPersonInfoVO hospitalPersonInfo) { + List list = hospitalPersonInfoService.getList(hospitalPersonInfo); + return AjaxResult.success(list); + } + /** * 导出健康咨询-科室人员信息列表 */ + @ApiOperation("导出健康咨询-科室人员信息列表") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:export')") @Log(title = "健康咨询-科室人员信息", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -62,6 +79,7 @@ public class HospitalPersonInfoController extends BaseController { /** * 获取健康咨询-科室人员信息详细信息 */ + @ApiOperation("获取健康咨询-科室人员信息详细信息") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,6 +89,7 @@ public class HospitalPersonInfoController extends BaseController { /** * 新增健康咨询-科室人员信息 */ + @ApiOperation("新增健康咨询-科室人员信息") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:add')") @Log(title = "健康咨询-科室人员信息", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -81,6 +100,7 @@ public class HospitalPersonInfoController extends BaseController { /** * 修改健康咨询-科室人员信息 */ + @ApiOperation("修改健康咨询-科室人员信息") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:edit')") @Log(title = "健康咨询-科室人员信息", businessType = BusinessType.UPDATE) @PostMapping("/edit") @@ -91,6 +111,7 @@ public class HospitalPersonInfoController extends BaseController { /** * 删除健康咨询-科室人员信息 */ + @ApiOperation("删除健康咨询-科室人员信息") @PreAuthorize("@ss.hasPermi('system:hospitalPerson:remove')") @Log(title = "健康咨询-科室人员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") 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 802fd95..74165f8 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 @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -31,9 +32,9 @@ public class ScheduleController extends BaseController { private IScheduleService scheduleService; /** - * 查询班次列表 + * 查询班次分页列表 */ - @ApiOperation("查询班次列表") + @ApiOperation("查询班次分页列表") @GetMapping("/list") public TableDataInfo list(Schedule schedule) { startPage(); @@ -41,6 +42,16 @@ public class ScheduleController extends BaseController { return getDataTable(list); } + /** + * 查询班次列表 + */ + @ApiOperation("查询班次列表") + @GetMapping("/getList") + public R> getList(Schedule schedule) { + List list = scheduleService.getList(schedule); + return R.ok(list); + } + @ApiOperation("新增班次") @PostMapping("add") public R add(@RequestBody Schedule schedule) { @@ -49,15 +60,25 @@ public class ScheduleController extends BaseController { @ApiOperation("修改班次") @PostMapping("update") - public R update(@RequestBody Schedule schedule) { + 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) { + @DeleteMapping("/{id}") + public R delete(@PathVariable Long id) { scheduleService.delete(id); return R.ok(); } + + /** + * 获取班次详细信息 + */ + @ApiOperation("获取班次详细信息") + @GetMapping(value = "getById/{id}") + public R getById(@PathVariable("id") Long id) { + return R.ok(scheduleService.getById(id)); + } + } 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 index 63bea07..087c59d 100644 --- 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 @@ -1,8 +1,17 @@ package com.xinelu.manage.controller.scheduleplan; +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.scheduleplan.SchedulePlan; import com.xinelu.manage.service.scheduleplan.ISchedulePlanService; import io.swagger.annotations.Api; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,11 +23,41 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "医生排班计划控制器") @RestController @RequestMapping("/system/schedule/plan") -public class SchedulePlanController { +public class SchedulePlanController extends BaseController { @Resource private ISchedulePlanService schedulePlanService; + /** + * 查询排班计划列表 + */ + @ApiOperation("查询排班计划分页列表") + @GetMapping("/list") + public TableDataInfo list(SchedulePlan plan) { + startPage(); + List list = schedulePlanService.getList(plan); + return getDataTable(list); + } + /** + * 查询排班计划列表 + */ + @ApiOperation("查询排班计划列表") + @GetMapping("/getList") + public R> getList(SchedulePlan plan) { + List list = schedulePlanService.getList(plan); + return R.ok(list); + } + + @ApiOperation("新增医生排班计划") + @PostMapping("add") + public R add(@RequestBody SchedulePlan schedulePlan) { + try { + schedulePlanService.save(schedulePlan); + return R.ok(); + } catch (Exception e) { + return R.fail("保存失败"); + } + } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplandetail/SchedulePlanDetailController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplandetail/SchedulePlanDetailController.java new file mode 100644 index 0000000..27d36b7 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/scheduleplandetail/SchedulePlanDetailController.java @@ -0,0 +1,34 @@ +package com.xinelu.manage.controller.scheduleplandetail; + +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.R; +import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; +import com.xinelu.manage.service.scheduleplandetail.ISchedulePlanDetailService; +import io.swagger.annotations.Api; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 排班计划明细控制器 + * @author: haown + * @create: 2023-09-25 15:14 + **/ +@Api(tags = "排班计划明细控制器") +@RestController +@RequestMapping("/system/schedule/plandetail") +public class SchedulePlanDetailController extends BaseController { + + @Resource + private ISchedulePlanDetailService planDetailService; + + @ApiOperation("通过排班计划查询明细") + @GetMapping("/getList") + public R> getList(SchedulePlanDetail planDetail) { + List list = planDetailService.getList(planDetail); + return R.ok(list); + } +} 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 42c9212..c08df15 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 @@ -2,6 +2,7 @@ package com.xinelu.manage.domain.schedule; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalTime; import lombok.Data; @@ -19,50 +20,59 @@ public class Schedule extends BaseEntity { /** * 医院主键 */ + @ApiModelProperty("医院主键") private Long hospitalId; /** * 医院名称 */ + @ApiModelProperty("医院名称") private String hospitalName; /** * 班次名称 */ + @ApiModelProperty("班次名称") private String scheduleName; /** * 班次上午开始时间 */ + @ApiModelProperty("班次上午开始时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime forenoonStartTime; /** * 班次上午结束时间 */ + @ApiModelProperty("班次上午结束时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime forenoonEndTime; /** * 班次下午开始时间 */ + @ApiModelProperty("班次下午开始时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime afternoonStartTime; /** * 班次下午结束时间 */ + @ApiModelProperty("班次下午结束时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime afternoonEndTime; /** * 启用状态（0正常 1停用） */ + @ApiModelProperty("启用状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 1代表删除） */ + @ApiModelProperty("删除标志（0代表存在 1代表删除）") private String delFlag; private static final long serialVersionUID = 1L; 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 28fd8a1..a88ae2e 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,6 +1,9 @@ package com.xinelu.manage.domain.scheduleplan; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -9,6 +12,7 @@ import lombok.Data; * @TableName schedule_plan */ @Data +@ApiModel("医生排班计划表") public class SchedulePlan extends BaseEntity { /** * 主键 @@ -18,76 +22,93 @@ public class SchedulePlan extends BaseEntity { /** * 医院主键 */ + @ApiModelProperty("医院id") private Long hospitalId; /** * 医院名称 */ + @ApiModelProperty("医院名称") private String hospitalName; /** * 所属部门id */ + @ApiModelProperty("所属部门id") private Long departmentId; /** * 所属部门名称 */ + @ApiModelProperty("所属部门名称") private String departmentName; /** * 班次主键 */ + @ApiModelProperty("班次id") private Long scheduleId; /** * 班次名称 */ + @ApiModelProperty("班次名称") private String scheduleName; /** * 医生主键 */ + @ApiModelProperty("医生id") private Long doctorId; /** * 医生姓名 */ + @ApiModelProperty("医生姓名") private String doctorName; /** * 排班开始日期 */ + @ApiModelProperty("排班开始日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private LocalDate scheduleStartDate; /** * 排班结束日期 */ + @ApiModelProperty("排班结束日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private LocalDate scheduleEndDate; /** * 每人可预约分钟数 */ + @ApiModelProperty("每人可预约分钟数") private Integer minutesPerPatient; /** * 每天可预约人数 */ + @ApiModelProperty(value = "每天可预约人数",hidden = true) private Integer patientsPerDay; /** * 出诊地点 */ + @ApiModelProperty("出诊地点") private String scheduleAddress; /** * 启用状态（0正常 1停用） */ + @ApiModelProperty("启用状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 1代表删除） */ + @ApiModelProperty("删除标志（0代表存在 1代表删除）") private String delFlag; private static final long serialVersionUID = 1L; 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 00843ea..387277d 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 @@ -51,6 +51,11 @@ public class SchedulePlanDetail implements Serializable { */ private String applyState; + /** + * 启用状态（0启用 1停用） + */ + private String status; + private static final long serialVersionUID = 1L; } \ No newline at end of file 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 4797159..9cd1d32 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 @@ -34,7 +34,7 @@ public class ScreeningRecordApplyDTO implements Serializable { * 居民姓名 */ @ApiModelProperty(value = "居民姓名", required = true) - private String residentName; + private String patientName; /** * 状态（1：已预约 2：取消预约 3：已登记 4：已完成） 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 43926f7..0bb08eb 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 @@ -28,7 +28,7 @@ public class ScreeningRecordDTO extends BaseEntity { * 居民姓名 */ @ApiModelProperty(value = "居民姓名") - private String residentName; + private String patientName; /** * 身份证号 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java index cd2bf3b..9a4492d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java @@ -29,6 +29,14 @@ public interface HospitalPersonInfoMapper { */ List selectHospitalPersonInfoList(HospitalPersonInfoVO hospitalPersonInfo); + /** + * 查询健康咨询-科室人员信息列表 + * + * @param hospitalPersonInfo 健康咨询-科室人员信息 + * @return 健康咨询-科室人员信息集合 + */ + List selectList(HospitalPersonInfo hospitalPersonInfo); + /** * 新增健康咨询-科室人员信息 * 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 b9e72c7..1ecfd74 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 @@ -25,4 +25,6 @@ public interface SchedulePlanDetailMapper { int batchInsert(List record); + List getList(SchedulePlanDetail planDetail); + } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java index 4140c5d..c792c35 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.hospitalpersoninfo; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; import com.xinelu.manage.dto.hospitalpersoninfo.HospitalPersonInfoDTO; import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO; import java.util.List; @@ -28,6 +29,8 @@ public interface IHospitalPersonInfoService { */ List selectHospitalPersonInfoList(HospitalPersonInfoVO hospitalPersonInfo); + List getList(HospitalPersonInfo hospitalPersonInfo); + /** * 新增健康咨询-科室人员信息 * diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java index a5fe277..61937c4 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java @@ -70,7 +70,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo); } - /** + @Override public List getList(HospitalPersonInfo hospitalPersonInfo) { + return hospitalPersonInfoMapper.selectList(hospitalPersonInfo); + } + + /** * 新增健康咨询-科室人员信息 * * @param hospitalPersonInfo 健康咨询-科室人员信息 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 index 74e5402..03c3d05 100644 --- 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 @@ -14,7 +14,9 @@ public interface IScheduleService { int update(Schedule schedule); - int delete(long id); + int delete(Long id); List getList(Schedule schedule); + + Schedule getById(Long id); } 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 bd7234d..32eaae4 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 @@ -20,19 +20,30 @@ public class ScheduleServiceImpl implements IScheduleService { @Resource private ScheduleMapper scheduleMapper; - @Override public int save(Schedule schedule) { + @Override + public int save(Schedule schedule) { + try { + verify(schedule); + } catch (Exception e) { + throw new RuntimeException(e); + } schedule.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); schedule.setCreateTime(new Date()); return scheduleMapper.insertSelective(schedule); } @Override public int update(Schedule schedule) { + try { + verify(schedule); + } catch (Exception e) { + throw new RuntimeException(e); + } schedule.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); schedule.setUpdateTime(new Date()); return scheduleMapper.updateByPrimaryKeySelective(schedule); } - @Override public int delete(long id) { + @Override public int delete(Long id) { Schedule schedule = new Schedule(); schedule.setId(id); schedule.setDelFlag("1"); @@ -44,6 +55,45 @@ public class ScheduleServiceImpl implements IScheduleService { @Override public List getList(Schedule schedule) { return scheduleMapper.getList(schedule); } + + @Override public Schedule getById(Long id) { + return scheduleMapper.selectByPrimaryKey(id); + } + + private void verify(Schedule schedule) throws Exception { + if (schedule.getForenoonStartTime() == null && schedule.getForenoonEndTime() == null && schedule.getAfternoonStartTime() == null && schedule.getAfternoonEndTime() == null) { + throw new Exception("请选择开始时间和结束时间！"); + } + if (schedule.getForenoonStartTime() == null) { + if (schedule.getForenoonEndTime() != null) { + throw new Exception("请选择上午开始时间！"); + } + } else { + if (schedule.getForenoonEndTime() == null) { + throw new Exception("请选择上午结束时间！"); + } else { + // 判断时间的先后顺序 + if (schedule.getForenoonEndTime().isBefore(schedule.getForenoonStartTime())) { + throw new Exception("上午开始时间应在上午结束时间之前！"); + } + } + } + + if (schedule.getAfternoonStartTime() == null) { + if (schedule.getAfternoonEndTime() != null) { + throw new Exception("请选择下午开始时间！"); + } + } else { + if (schedule.getAfternoonEndTime() == null) { + throw new Exception("请选择下午结束时间！"); + } else { + // 判断时间的先后顺序 + if (schedule.getAfternoonEndTime().isBefore(schedule.getAfternoonStartTime())) { + throw new Exception("下午开始时间应在下午结束时间之前！"); + } + } + } + } } 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 192c75e..fff3368 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 @@ -44,7 +44,7 @@ public class SchedulePlanServiceImpl implements ISchedulePlanService { // 保存排班计划 schedulePlan.setDelFlag("0"); if (StringUtils.isBlank(schedulePlan.getStatus())) { - schedulePlan.setStatus("1"); + schedulePlan.setStatus("0"); } int flag = schedulePlanMapper.insert(schedulePlan); @@ -52,6 +52,9 @@ public class SchedulePlanServiceImpl implements ISchedulePlanService { if (flag > 0) { // 计算排班天数 long days = ChronoUnit.DAYS.between(schedulePlan.getScheduleStartDate(), schedulePlan.getScheduleEndDate()); + if (days < 0) { + throw new Exception("排班结束时间应在排班开始时间之后。"); + } for (int i = 0; i <= days; i++) { int patientsPerDay = 0; // 排班计划明细 @@ -59,6 +62,9 @@ public class SchedulePlanServiceImpl implements ISchedulePlanService { SchedulePlanDetail schedulePlanDetail = new SchedulePlanDetail(); schedulePlanDetail.setSchedulePlanId(schedulePlan.getId()); schedulePlanDetail.setScheduleDate(schedulePlan.getScheduleStartDate().plusDays(i)); + schedulePlanDetail.setDoctorId(schedulePlan.getDoctorId()); + schedulePlanDetail.setDoctorName(schedulePlan.getDoctorName()); + schedulePlanDetail.setStatus("0"); // 生成上午计划 if (schedule.getForenoonStartTime() != null && schedule.getForenoonEndTime() != null) { // 根据时间间隔计算时间段 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java index dc3810e..7880c35 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/scheduleplandetail/ISchedulePlanDetailService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.scheduleplandetail; import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; +import java.util.List; /** * @author haown @@ -11,4 +12,5 @@ public interface ISchedulePlanDetailService { int save(SchedulePlanDetail planDetail); + List getList(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 d0ddbcc..7fb8c91 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 @@ -3,6 +3,7 @@ package com.xinelu.manage.service.scheduleplandetail.impl; import com.xinelu.manage.domain.scheduleplandetail.SchedulePlanDetail; import com.xinelu.manage.mapper.scheduleplandetail.SchedulePlanDetailMapper; import com.xinelu.manage.service.scheduleplandetail.ISchedulePlanDetailService; +import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; @@ -20,6 +21,10 @@ public class SchedulePlanDetailServiceImpl implements ISchedulePlanDetailService @Override public int save(SchedulePlanDetail planDetail) { return planDetailMapper.insert(planDetail); } + + @Override public List getList(SchedulePlanDetail planDetail) { + return planDetailMapper.getList(planDetail); + } } 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 4f75d06..9d47249 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 @@ -118,7 +118,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { if(flag > 0) { // 推送消息 //JSONObject jsonObject = new JSONObject(); - //jsonObject.fluentPut("recipientName", registerVo.getResidentName()) + //jsonObject.fluentPut("recipientName", registerVo.getPatientName()) // .fluentPut("handleDate", recordBody.getApplyStartTime()) // .fluentPut("hospitalName", recordBody.getDeptName()) // .fluentPut("applyContent", recordBody.getProjectName()) @@ -338,7 +338,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { //jsonObject.fluentPut("senderNo", SecurityUtils.getUserId()) // .fluentPut("senderName", SecurityUtils.getLoginUser().getUser().getNickName()) // .fluentPut("doctorName", SecurityUtils.getLoginUser().getUser().getNickName()) - // .fluentPut("recipientName", register.getResidentName()) + // .fluentPut("recipientName", register.getPatientName()) // .fluentPut("recipientIdentity", register.getIdentity()) // .fluentPut("sendTime", DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")) // .fluentPut("messageType", "4") diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitaldepartmentinfo/HospitalDepartmentInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitaldepartmentinfo/HospitalDepartmentInfoMapper.xml index c223835..e68e1f4 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitaldepartmentinfo/HospitalDepartmentInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitaldepartmentinfo/HospitalDepartmentInfoMapper.xml @@ -42,7 +42,7 @@ + @@ -36,10 +37,10 @@ insert into schedule_plan_detail ( id,schedule_plan_id,doctor_id ,doctor_name,schedule_date,schedule_start_time - ,schedule_end_time,apply_state) + ,schedule_end_time,status,apply_state) values (#{id,jdbcType=BIGINT},#{schedulePlanId,jdbcType=BIGINT},#{doctorId,jdbcType=BIGINT} ,#{doctorName,jdbcType=VARCHAR},#{scheduleDate,jdbcType=DATE},#{scheduleStartTime,jdbcType=TIME} - ,#{scheduleEndTime,jdbcType=TIME},#{applyState,jdbcType=VARCHAR}) + ,#{scheduleEndTime,jdbcType=TIME},#{status,jdbcType=CHAR},#{applyState,jdbcType=VARCHAR}) insert into schedule_plan_detail @@ -51,6 +52,7 @@ schedule_date, schedule_start_time, schedule_end_time, + status, apply_state, @@ -61,6 +63,7 @@ #{scheduleDate,jdbcType=DATE}, #{scheduleStartTime,jdbcType=TIME}, #{scheduleEndTime,jdbcType=TIME}, + #{status,jdbcType=CHAR}, #{applyState,jdbcType=VARCHAR}, @@ -85,6 +88,9 @@ schedule_end_time = #{scheduleEndTime,jdbcType=TIME}, + + status = #{status,jdbcType=CHAR}, + apply_state = #{applyState,jdbcType=VARCHAR}, @@ -100,6 +106,7 @@ schedule_date = #{scheduleDate,jdbcType=DATE}, schedule_start_time = #{scheduleStartTime,jdbcType=TIME}, schedule_end_time = #{scheduleEndTime,jdbcType=TIME}, + status = #{status,jdbcType=CHAR}, apply_state = #{applyState,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} @@ -107,12 +114,28 @@ insert into schedule_plan_detail (schedule_plan_id,doctor_id ,doctor_name,schedule_date,schedule_start_time - ,schedule_end_time,apply_state) values + ,schedule_end_time,status,apply_state) values - (#{schedulePlanId,jdbcType=BIGINT},#{doctorId,jdbcType=BIGINT} - ,#{doctorName,jdbcType=VARCHAR},#{scheduleDate,jdbcType=DATE},#{scheduleStartTime,jdbcType=TIME} - ,#{scheduleEndTime,jdbcType=TIME},#{applyState,jdbcType=VARCHAR}) + (#{item.schedulePlanId},#{item.doctorId} + ,#{item.doctorName},#{item.scheduleDate},#{item.scheduleStartTime} + ,#{item.scheduleEndTime},#{item.status},#{item.applyState}) - + + diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml index fbf02c1..a792e38 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml @@ -34,7 +34,7 @@ select - from sd_project + from screening_project where project_id = #{projectId,jdbcType=VARCHAR} - delete from sd_project + delete from screening_project where project_id = #{projectId,jdbcType=VARCHAR} - insert into sd_project + insert into screening_project ( id,project_id,project_name ,project_type,price,discount ,discount_price,status,dept_id @@ -81,7 +81,7 @@ ,#{remark,jdbcType=VARCHAR}) - insert into sd_project + insert into screening_project id, project_id, @@ -120,7 +120,7 @@ - update sd_project + update screening_project project_name = #{projectName,jdbcType=VARCHAR}, @@ -168,7 +168,7 @@ where project_id = #{projectId,jdbcType=VARCHAR} - update sd_project + update screening_project set project_name = #{projectName,jdbcType=VARCHAR}, project_type = #{projectType,jdbcType=CHAR}, @@ -187,7 +187,7 @@ where project_id = #{projectId,jdbcType=VARCHAR} - select from sd_screening_record where screening_id = #{screeningId} + select from screening_record where screening_id = #{screeningId} - + select from screening_record where patient_id = #{patientId} and screening_status in ('1', '3') and screening_type = '1' limit 1 @@ -170,8 +170,8 @@ and patient_id = #{patientId} - - and resident_name like concat(#{residentName}, '%') + + and patient_name like concat(#{patientName}, '%') and identity = #{identity} @@ -225,14 +225,14 @@ else '0' end as hasResult, case when diagnostic_result is not null then '1' else '0' end as hasDiagnose - from sd_screening_record d left join sd_register r on d.patient_id = r.patient_id + from screening_record d left join patient_info r on d.patient_id = r.patient_id d.screening_status != '2' and r.del_flag = '0' and r.status = '0' and d.screening_status = #{screeningStatus} - - and r.resident_name like concat(#{residentName}, '%') + + and r.patient_name like concat(#{patientName}, '%') and r.identity = #{identity} @@ -309,7 +309,7 @@ select , case when date_format(apply_end_time, '%y%m%d%H%i') < date_format(now(), '%y%m%d%H%i') then '1' else '0' end as exceedStatus - from sd_screening_record record + from screening_record record where screening_status != '2' order by apply_start_time desc @@ -322,7 +322,7 @@ 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, ssr.remark,sf.suffix as fileType - from sd_screening_record ssr + from screening_record ssr LEFT JOIN sys_file sf ON sf.file_id=ssr.attachment where 1=1 @@ -331,7 +331,7 @@