From dcb514453382b57752f2a20d2f9e62644d84cce4 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 15 Mar 2024 15:25:27 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDiseaseRouteController.java | 91 ++++++++ .../SpecialDiseaseRoute.java | 140 +++++++++++ .../SpecialDiseaseRouteMapper.java | 62 +++++ .../ISpecialDiseaseRouteService.java | 62 +++++ .../impl/SpecialDiseaseRouteServiceImpl.java | 91 ++++++++ .../SpecialDiseaseRouteMapper.xml | 217 ++++++++++++++++++ 6 files changed, 663 insertions(+) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseaseroute/SpecialDiseaseRoute.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java new file mode 100644 index 00000000..367a93d9 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.specialdiseaseroute; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 专病路径信息Controller + * + * @author xinelu + * @date 2024-03-13 + */ +@RestController +@RequestMapping("/system/specialDiseaseRoute") +public class SpecialDiseaseRouteController extends BaseController { + @Resource + private ISpecialDiseaseRouteService specialDiseaseRouteService; + + /** + * 查询专病路径信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:list')") + @GetMapping("/list") + public TableDataInfo list(SpecialDiseaseRoute specialDiseaseRoute) { + startPage(); + List list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute); + return getDataTable(list); + } + + /** + * 导出专病路径信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:export')") + @Log(title = "专病路径信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SpecialDiseaseRoute specialDiseaseRoute) { + List list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute); + ExcelUtil util = new ExcelUtil(SpecialDiseaseRoute.class); + util.exportExcel(response, list, "专病路径信息数据"); + } + + /** + * 获取专病路径信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(specialDiseaseRouteService.selectSpecialDiseaseRouteById(id)); + } + + /** + * 新增专病路径信息 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')") + @Log(title = "专病路径信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) { + return toAjax(specialDiseaseRouteService.insertSpecialDiseaseRoute(specialDiseaseRoute)); + } + + /** + * 修改专病路径信息 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')") + @Log(title = "专病路径信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) { + return toAjax(specialDiseaseRouteService.updateSpecialDiseaseRoute(specialDiseaseRoute)); + } + + /** + * 删除专病路径信息 + */ + @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:remove')") + @Log(title = "专病路径信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(specialDiseaseRouteService.deleteSpecialDiseaseRouteByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseaseroute/SpecialDiseaseRoute.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseaseroute/SpecialDiseaseRoute.java new file mode 100644 index 00000000..0933997d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseaseroute/SpecialDiseaseRoute.java @@ -0,0 +1,140 @@ +package com.xinelu.manage.domain.specialdiseaseroute; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 专病路径信息对象 special_disease_route + * + * @author xinelu + * @date 2024-03-13 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "专病路径信息对象", description = "special_disease_route") +public class SpecialDiseaseRoute extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 所属科室id + */ + @ApiModelProperty(value = "所属科室id") + @Excel(name = "所属科室id") + private Long departmentId; + + /** + * 所属科室名称 + */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** + * 病种id + */ + @ApiModelProperty(value = "病种id") + @Excel(name = "病种id") + private Long diseaseTypeId; + + /** + * 病种名称 + */ + @ApiModelProperty(value = "病种名称") + @Excel(name = "病种名称") + private String diseaseTypeName; + + /** + * 路径名称 + */ + @ApiModelProperty(value = "路径名称") + @Excel(name = "路径名称") + private String routeName; + + /** + * 路径编码 + */ + @ApiModelProperty(value = "路径编码") + @Excel(name = "路径编码") + private String routeCode; + + /** + * 版本号 + */ + @ApiModelProperty(value = "版本号") + @Excel(name = "版本号") + private String version; + + /** + * 路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH + */ + @ApiModelProperty(value = "路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH") + @Excel(name = "路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH") + private String routeClassify; + + /** + * 发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED + */ + @ApiModelProperty(value = "发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED") + @Excel(name = "发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED") + private String releaseStatus; + + /** + * 适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE + */ + @ApiModelProperty(value = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE") + @Excel(name = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE") + private String suitRange; + + /** + * 排序 + */ + @ApiModelProperty(value = "排序") + @Excel(name = "排序") + private Long routeSort; + + /** + * 备注信息 + */ + @ApiModelProperty(value = "备注信息") + @Excel(name = "备注信息") + private String routeRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("departmentId", getDepartmentId()) + .append("departmentName", getDepartmentName()) + .append("diseaseTypeId", getDiseaseTypeId()) + .append("diseaseTypeName", getDiseaseTypeName()) + .append("routeName", getRouteName()) + .append("routeCode", getRouteCode()) + .append("version", getVersion()) + .append("routeClassify", getRouteClassify()) + .append("releaseStatus", getReleaseStatus()) + .append("suitRange", getSuitRange()) + .append("routeSort", getRouteSort()) + .append("routeRemark", getRouteRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java new file mode 100644 index 00000000..223891be --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.mapper.specialdiseaseroute; + +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; + +import java.util.List; + + +/** + * 专病路径信息Mapper接口 + * + * @author xinelu + * @date 2024-03-13 + */ +public interface SpecialDiseaseRouteMapper { + /** + * 查询专病路径信息 + * + * @param id 专病路径信息主键 + * @return 专病路径信息 + */ + public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id); + + /** + * 查询专病路径信息列表 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 专病路径信息集合 + */ + public List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 新增专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 修改专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 删除专病路径信息 + * + * @param id 专病路径信息主键 + * @return 结果 + */ + public int deleteSpecialDiseaseRouteById(Long id); + + /** + * 批量删除专病路径信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSpecialDiseaseRouteByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java new file mode 100644 index 00000000..d9a535be --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.service.specialdiseaseroute; + +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; + +import java.util.List; + + +/** + * 专病路径信息Service接口 + * + * @author xinelu + * @date 2024-03-13 + */ +public interface ISpecialDiseaseRouteService { + /** + * 查询专病路径信息 + * + * @param id 专病路径信息主键 + * @return 专病路径信息 + */ + public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id); + + /** + * 查询专病路径信息列表 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 专病路径信息集合 + */ + public List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 新增专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 修改专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + + /** + * 批量删除专病路径信息 + * + * @param ids 需要删除的专病路径信息主键集合 + * @return 结果 + */ + public int deleteSpecialDiseaseRouteByIds(Long[] ids); + + /** + * 删除专病路径信息信息 + * + * @param id 专病路径信息主键 + * @return 结果 + */ + public int deleteSpecialDiseaseRouteById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java new file mode 100644 index 00000000..f4f75a20 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.service.specialdiseaseroute.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; +import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 专病路径信息Service业务层处理 + * + * @author xinelu + * @date 2024-03-13 + */ +@Service +public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteService { + @Resource + private SpecialDiseaseRouteMapper specialDiseaseRouteMapper; + + /** + * 查询专病路径信息 + * + * @param id 专病路径信息主键 + * @return 专病路径信息 + */ + @Override + public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id) { + return specialDiseaseRouteMapper.selectSpecialDiseaseRouteById(id); + } + + /** + * 查询专病路径信息列表 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 专病路径信息 + */ + @Override + public List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute) { + return specialDiseaseRouteMapper.selectSpecialDiseaseRouteList(specialDiseaseRoute); + } + + /** + * 新增专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + @Override + public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) { + specialDiseaseRoute.setCreateTime(DateUtils.getNowDate()); + return specialDiseaseRouteMapper.insertSpecialDiseaseRoute(specialDiseaseRoute); + } + + /** + * 修改专病路径信息 + * + * @param specialDiseaseRoute 专病路径信息 + * @return 结果 + */ + @Override + public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) { + specialDiseaseRoute.setUpdateTime(DateUtils.getNowDate()); + return specialDiseaseRouteMapper.updateSpecialDiseaseRoute(specialDiseaseRoute); + } + + /** + * 批量删除专病路径信息 + * + * @param ids 需要删除的专病路径信息主键 + * @return 结果 + */ + @Override + public int deleteSpecialDiseaseRouteByIds(Long[] ids) { + return specialDiseaseRouteMapper.deleteSpecialDiseaseRouteByIds(ids); + } + + /** + * 删除专病路径信息信息 + * + * @param id 专病路径信息主键 + * @return 结果 + */ + @Override + public int deleteSpecialDiseaseRouteById(Long id) { + return specialDiseaseRouteMapper.deleteSpecialDiseaseRouteById(id); + } +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml new file mode 100644 index 00000000..0edcfcaa --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, department_id, department_name, disease_type_id, disease_type_name, route_name, route_code, version, route_classify, release_status, suit_range, route_sort, route_remark, create_by, create_time, update_by, update_time from special_disease_route + + + + + + + + insert into special_disease_route + + department_id, + + department_name, + + disease_type_id, + + disease_type_name, + + route_name, + + route_code, + + version, + + route_classify, + + release_status, + + suit_range, + + route_sort, + + route_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{departmentId}, + + #{departmentName}, + + #{diseaseTypeId}, + + #{diseaseTypeName}, + + #{routeName}, + + #{routeCode}, + + #{version}, + + #{routeClassify}, + + #{releaseStatus}, + + #{suitRange}, + + #{routeSort}, + + #{routeRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update special_disease_route + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + disease_type_id = + #{diseaseTypeId}, + + disease_type_name = + #{diseaseTypeName}, + + route_name = + #{routeName}, + + route_code = + #{routeCode}, + + version = + #{version}, + + route_classify = + #{routeClassify}, + + release_status = + #{releaseStatus}, + + suit_range = + #{suitRange}, + + route_sort = + #{routeSort}, + + route_remark = + #{routeRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from special_disease_route where id = #{id} + + + + delete from special_disease_route where id in + + #{id} + + + \ No newline at end of file From 220ede449569eea294f9f4dc2e15b2b2d27be5c6 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 18 Mar 2024 14:13:15 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDiseaseRouteController.java | 12 +- .../TaskPartitionDictController.java | 9 + .../TaskStatusDictController.java | 4 +- .../SpecialDiseaseRouteMapper.java | 21 +- .../ISpecialDiseaseRouteService.java | 9 + .../impl/SpecialDiseaseRouteServiceImpl.java | 26 ++ .../SpecialDiseaseRouteMapper.xml | 370 ++++++++++-------- 7 files changed, 273 insertions(+), 178 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java index 367a93d9..22ccdf40 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java @@ -64,7 +64,7 @@ public class SpecialDiseaseRouteController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')") @Log(title = "专病路径信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) { return toAjax(specialDiseaseRouteService.insertSpecialDiseaseRoute(specialDiseaseRoute)); } @@ -74,7 +74,7 @@ public class SpecialDiseaseRouteController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')") @Log(title = "专病路径信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) { return toAjax(specialDiseaseRouteService.updateSpecialDiseaseRoute(specialDiseaseRoute)); } @@ -88,4 +88,12 @@ public class SpecialDiseaseRouteController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(specialDiseaseRouteService.deleteSpecialDiseaseRouteByIds(ids)); } + + /** + * 科室路径数量 + */ + @GetMapping("/departmentRouteCount") + public AjaxResult departmentRouteCount(String departmentName) { + return specialDiseaseRouteService.departmentRouteCount(departmentName); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskpartitiondict/TaskPartitionDictController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskpartitiondict/TaskPartitionDictController.java index df21c00e..5723a447 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskpartitiondict/TaskPartitionDictController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskpartitiondict/TaskPartitionDictController.java @@ -38,6 +38,15 @@ public class TaskPartitionDictController extends BaseController { return getDataTable(list); } + + /** + * 查询任务细分字典列表 - 不分页 + */ + @GetMapping("/taskPartitionList") + public AjaxResult taskPartitionList(TaskPartitionDict taskPartitionDict) { + return AjaxResult.success(taskPartitionDictService.selectTaskPartitionDictList(taskPartitionDict)); + } + /** * 导出任务细分字典列表 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java index 2200722a..ff067538 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java @@ -64,7 +64,7 @@ public class TaskStatusDictController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:taskStatus:add')") @Log(title = "任务状态字典", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody TaskStatusDict taskStatusDict) { return toAjax(taskStatusDictService.insertTaskStatusDict(taskStatusDict)); } @@ -74,7 +74,7 @@ public class TaskStatusDictController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:taskStatus:edit')") @Log(title = "任务状态字典", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody TaskStatusDict taskStatusDict) { return toAjax(taskStatusDictService.updateTaskStatusDict(taskStatusDict)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java index 223891be..ae229a8c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.specialdiseaseroute; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.vo.department.DepartmentVO; import java.util.List; @@ -18,7 +19,7 @@ public interface SpecialDiseaseRouteMapper { * @param id 专病路径信息主键 * @return 专病路径信息 */ - public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id); + SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id); /** * 查询专病路径信息列表 @@ -26,7 +27,7 @@ public interface SpecialDiseaseRouteMapper { * @param specialDiseaseRoute 专病路径信息 * @return 专病路径信息集合 */ - public List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); + List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); /** * 新增专病路径信息 @@ -34,7 +35,7 @@ public interface SpecialDiseaseRouteMapper { * @param specialDiseaseRoute 专病路径信息 * @return 结果 */ - public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); /** * 修改专病路径信息 @@ -42,7 +43,7 @@ public interface SpecialDiseaseRouteMapper { * @param specialDiseaseRoute 专病路径信息 * @return 结果 */ - public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); /** * 删除专病路径信息 @@ -50,7 +51,7 @@ public interface SpecialDiseaseRouteMapper { * @param id 专病路径信息主键 * @return 结果 */ - public int deleteSpecialDiseaseRouteById(Long id); + int deleteSpecialDiseaseRouteById(Long id); /** * 批量删除专病路径信息 @@ -58,5 +59,13 @@ public interface SpecialDiseaseRouteMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteSpecialDiseaseRouteByIds(Long[] ids); + int deleteSpecialDiseaseRouteByIds(Long[] ids); + + /** + * 科室路径数量 + * + * @param departmentName 科室名称 + * @return DepartmentVO + */ + List departmentRouteByDepartmentName(String departmentName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java index d9a535be..aa1d1650 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.specialdiseaseroute; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import java.util.List; @@ -59,4 +60,12 @@ public interface ISpecialDiseaseRouteService { * @return 结果 */ public int deleteSpecialDiseaseRouteById(Long id); + + /** + * 科室路径数量 + * + * @param departmentName 科室名称 + * @return AjaxResult + */ + AjaxResult departmentRouteCount(String departmentName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java index f4f75a20..ccd4ee05 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -1,12 +1,16 @@ package com.xinelu.manage.service.specialdiseaseroute.impl; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; +import com.xinelu.manage.vo.department.DepartmentVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @@ -88,4 +92,26 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi public int deleteSpecialDiseaseRouteById(Long id) { return specialDiseaseRouteMapper.deleteSpecialDiseaseRouteById(id); } + + /** + * 科室路径数量 + * + * @param departmentName 科室名称 + * @return AjaxResult + */ + @Override + public AjaxResult departmentRouteCount(String departmentName) { + DepartmentVO departmentVO = new DepartmentVO(); + List department = new ArrayList<>(); + departmentVO.setDepartmentName("全部"); + departmentVO.setCountNum(0); + List departmentVOS = specialDiseaseRouteMapper.departmentRouteByDepartmentName(departmentName); + if (CollectionUtils.isNotEmpty(departmentVOS)) { + Integer result = departmentVOS.stream().mapToInt(DepartmentVO::getCountNum).sum(); + departmentVO.setCountNum(result); + department.add(departmentVO); + department.addAll(departmentVOS); + } + return AjaxResult.success(department); + } } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml index 0edcfcaa..322c49a6 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml @@ -5,68 +5,86 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - select id, department_id, department_name, disease_type_id, disease_type_name, route_name, route_code, version, route_classify, release_status, suit_range, route_sort, route_remark, create_by, create_time, update_by, update_time from special_disease_route + select id, + department_id, + department_name, + disease_type_id, + disease_type_name, + route_name, + route_code, + version, + route_classify, + release_status, + suit_range, + route_sort, + route_remark, + create_by, + create_time, + update_by, + update_time + from special_disease_route - - - and department_id = #{departmentId} - - - and department_name like concat('%', #{departmentName}, '%') - - - and disease_type_id = #{diseaseTypeId} - - - and disease_type_name like concat('%', #{diseaseTypeName}, '%') - - - and route_name like concat('%', #{routeName}, '%') - - - and route_code = #{routeCode} - - - and version = #{version} - - - and route_classify = #{routeClassify} - - - and release_status = #{releaseStatus} - - - and suit_range = #{suitRange} - - - and route_sort = #{routeSort} - - - and route_remark = #{routeRemark} - + + and department_id = #{departmentId} + + + and department_name like concat('%', #{departmentName}, '%') + + + and disease_type_id = #{diseaseTypeId} + + + and disease_type_name like concat('%', #{diseaseTypeName}, '%') + + + and route_name like concat('%', #{routeName}, '%') + + + and route_code = #{routeCode} + + + and version = #{version} + + + and route_classify = #{routeClassify} + + + and release_status = #{releaseStatus} + + + and suit_range = #{suitRange} + + + and route_sort = #{routeSort} + + + and route_remark = #{routeRemark} + @@ -80,132 +98,134 @@ keyProperty="id"> insert into special_disease_route - department_id, - - department_name, - - disease_type_id, - - disease_type_name, - - route_name, - - route_code, - - version, - - route_classify, - - release_status, - - suit_range, - - route_sort, - - route_remark, - - create_by, - - create_time, - - update_by, - - update_time, - + department_id, + + department_name, + + disease_type_id, + + disease_type_name, + + route_name, + + route_code, + + version, + + route_classify, + + release_status, + + suit_range, + + route_sort, + + route_remark, + + create_by, + + create_time, + + update_by, + + update_time, + - #{departmentId}, - - #{departmentName}, - - #{diseaseTypeId}, - - #{diseaseTypeName}, - - #{routeName}, - - #{routeCode}, - - #{version}, - - #{routeClassify}, - - #{releaseStatus}, - - #{suitRange}, - - #{routeSort}, - - #{routeRemark}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - + #{departmentId}, + + #{departmentName}, + + #{diseaseTypeId}, + + #{diseaseTypeName}, + + #{routeName}, + + #{routeCode}, + + #{version}, + + #{routeClassify}, + + #{releaseStatus}, + + #{suitRange}, + + #{routeSort}, + + #{routeRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + update special_disease_route - department_id = - #{departmentId}, - - department_name = - #{departmentName}, - - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - - route_name = - #{routeName}, - - route_code = - #{routeCode}, - - version = - #{version}, - - route_classify = - #{routeClassify}, - - release_status = - #{releaseStatus}, - - suit_range = - #{suitRange}, - - route_sort = - #{routeSort}, - - route_remark = - #{routeRemark}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + disease_type_id = + #{diseaseTypeId}, + + disease_type_name = + #{diseaseTypeName}, + + route_name = + #{routeName}, + + route_code = + #{routeCode}, + + version = + #{version}, + + route_classify = + #{routeClassify}, + + release_status = + #{releaseStatus}, + + suit_range = + #{suitRange}, + + route_sort = + #{routeSort}, + + route_remark = + #{routeRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + where id = #{id} - delete from special_disease_route where id = #{id} + delete + from special_disease_route + where id = #{id} @@ -214,4 +234,18 @@ #{id} + + \ No newline at end of file From 9714c58f4697f7512ef2d7bd6fd632b7a332f49a Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 18 Mar 2024 16:37:51 +0800 Subject: [PATCH 03/32] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cialDiseaseTriggerConditionController.java | 91 +++++++++ .../SpecialDiseaseNode.java | 3 +- .../SpecialDiseaseTriggerCondition.java | 108 ++++++++++ .../SpecialDiseaseTriggerConditionMapper.java | 61 ++++++ ...SpecialDiseaseTriggerConditionService.java | 61 ++++++ ...ialDiseaseTriggerConditionServiceImpl.java | 91 +++++++++ .../SpecialDiseaseTriggerConditionMapper.xml | 190 ++++++++++++++++++ 7 files changed, 604 insertions(+), 1 deletion(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasetriggercondition/SpecialDiseaseTriggerCondition.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java new file mode 100644 index 00000000..932a15d0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.specialdiseasetriggercondition; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 触发条件关系Controller + * + * @author xinelu + * @date 2024-03-18 + */ +@RestController +@RequestMapping("/system/triggerCondition") +public class SpecialDiseaseTriggerConditionController extends BaseController { + @Resource + private ISpecialDiseaseTriggerConditionService specialDiseaseTriggerConditionService; + + /** + * 查询触发条件关系列表 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:list')") + @GetMapping("/list") + public TableDataInfo list(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + startPage(); + List list = specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition); + return getDataTable(list); + } + + /** + * 导出触发条件关系列表 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:export')") + @Log(title = "触发条件关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + List list = specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition); + ExcelUtil util = new ExcelUtil(SpecialDiseaseTriggerCondition.class); + util.exportExcel(response, list, "触发条件关系数据"); + } + + /** + * 获取触发条件关系详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionById(id)); + } + + /** + * 新增触发条件关系 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:add')") + @Log(title = "触发条件关系", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition)); + } + + /** + * 修改触发条件关系 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:edit')") + @Log(title = "触发条件关系", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + return toAjax(specialDiseaseTriggerConditionService.updateSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition)); + } + + /** + * 删除触发条件关系 + */ + @PreAuthorize("@ss.hasPermi('system:triggerCondition:remove')") + @Log(title = "触发条件关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(specialDiseaseTriggerConditionService.deleteSpecialDiseaseTriggerConditionByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index d681e802..b1acebfc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.time.LocalTime; import java.util.Date; /** @@ -95,7 +96,7 @@ public class SpecialDiseaseNode extends BaseEntity { @ApiModelProperty(value = "执行时间，格式：HH:mm") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd") - private Date executionTime; + private LocalTime executionTime; /** * 模板表id diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasetriggercondition/SpecialDiseaseTriggerCondition.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasetriggercondition/SpecialDiseaseTriggerCondition.java new file mode 100644 index 00000000..c275abd4 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasetriggercondition/SpecialDiseaseTriggerCondition.java @@ -0,0 +1,108 @@ +package com.xinelu.manage.domain.specialdiseasetriggercondition; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 触发条件关系对象 special_disease_trigger_condition + * + * @author xinelu + * @date 2024-03-18 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "触发条件关系对象", description = "special_disease_trigger_condition") +public class SpecialDiseaseTriggerCondition extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 专病路径表id + */ + @ApiModelProperty(value = "专病路径表id") + @Excel(name = "专病路径表id") + private Long routeId; + + /** + * 路径名称 + */ + @ApiModelProperty(value = "路径名称") + @Excel(name = "路径名称") + private String routeName; + + /** + * 触发条件编码 + */ + @ApiModelProperty(value = "触发条件编码") + @Excel(name = "触发条件编码") + private String triggerConditionCode; + + /** + * 触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME + */ + @ApiModelProperty(value = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME") + @Excel(name = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME") + private String triggerConditionName; + + /** + * 触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO + */ + @ApiModelProperty(value = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO") + @Excel(name = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO") + private String triggerConditionOperator; + + /** + * 触发条件值 + */ + @ApiModelProperty(value = "触发条件值") + @Excel(name = "触发条件值") + private String triggerConditionValue; + + /** + * 排序 + */ + @ApiModelProperty(value = "排序") + @Excel(name = "排序") + private Integer triggerConditionSort; + + /** + * 备注信息 + */ + @ApiModelProperty(value = "备注信息") + @Excel(name = "备注信息") + private String triggerConditionRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("routeId", getRouteId()) + .append("routeName", getRouteName()) + .append("triggerConditionCode", getTriggerConditionCode()) + .append("triggerConditionName", getTriggerConditionName()) + .append("triggerConditionOperator", getTriggerConditionOperator()) + .append("triggerConditionValue", getTriggerConditionValue()) + .append("triggerConditionSort", getTriggerConditionSort()) + .append("triggerConditionRemark", getTriggerConditionRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java new file mode 100644 index 00000000..23ee7b42 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.specialdiseasetriggercondition; + +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; + +import java.util.List; + +/** + * 触发条件关系Mapper接口 + * + * @author xinelu + * @date 2024-03-18 + */ +public interface SpecialDiseaseTriggerConditionMapper { + /** + * 查询触发条件关系 + * + * @param id 触发条件关系主键 + * @return 触发条件关系 + */ + public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + + /** + * 查询触发条件关系列表 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 触发条件关系集合 + */ + public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 新增触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 修改触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 删除触发条件关系 + * + * @param id 触发条件关系主键 + * @return 结果 + */ + public int deleteSpecialDiseaseTriggerConditionById(Long id); + + /** + * 批量删除触发条件关系 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java new file mode 100644 index 00000000..67bb2be8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.specialdiseasetriggercondition; + +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; + +import java.util.List; + +/** + * 触发条件关系Service接口 + * + * @author xinelu + * @date 2024-03-18 + */ +public interface ISpecialDiseaseTriggerConditionService { + /** + * 查询触发条件关系 + * + * @param id 触发条件关系主键 + * @return 触发条件关系 + */ + public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + + /** + * 查询触发条件关系列表 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 触发条件关系集合 + */ + public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 新增触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 修改触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 批量删除触发条件关系 + * + * @param ids 需要删除的触发条件关系主键集合 + * @return 结果 + */ + public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + + /** + * 删除触发条件关系信息 + * + * @param id 触发条件关系主键 + * @return 结果 + */ + public int deleteSpecialDiseaseTriggerConditionById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java new file mode 100644 index 00000000..9cd8b60a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.service.specialdiseasetriggercondition.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; +import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 触发条件关系Service业务层处理 + * + * @author xinelu + * @date 2024-03-18 + */ +@Service +public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseaseTriggerConditionService { + @Resource + private SpecialDiseaseTriggerConditionMapper specialDiseaseTriggerConditionMapper; + + /** + * 查询触发条件关系 + * + * @param id 触发条件关系主键 + * @return 触发条件关系 + */ + @Override + public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id) { + return specialDiseaseTriggerConditionMapper.selectSpecialDiseaseTriggerConditionById(id); + } + + /** + * 查询触发条件关系列表 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 触发条件关系 + */ + @Override + public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + return specialDiseaseTriggerConditionMapper.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition); + } + + /** + * 新增触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + @Override + public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + specialDiseaseTriggerCondition.setCreateTime(DateUtils.getNowDate()); + return specialDiseaseTriggerConditionMapper.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); + } + + /** + * 修改触发条件关系 + * + * @param specialDiseaseTriggerCondition 触发条件关系 + * @return 结果 + */ + @Override + public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + specialDiseaseTriggerCondition.setUpdateTime(DateUtils.getNowDate()); + return specialDiseaseTriggerConditionMapper.updateSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); + } + + /** + * 批量删除触发条件关系 + * + * @param ids 需要删除的触发条件关系主键 + * @return 结果 + */ + @Override + public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids) { + return specialDiseaseTriggerConditionMapper.deleteSpecialDiseaseTriggerConditionByIds(ids); + } + + /** + * 删除触发条件关系信息 + * + * @param id 触发条件关系主键 + * @return 结果 + */ + @Override + public int deleteSpecialDiseaseTriggerConditionById(Long id) { + return specialDiseaseTriggerConditionMapper.deleteSpecialDiseaseTriggerConditionById(id); + } +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml new file mode 100644 index 00000000..dbd1096b --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + select id, + route_id, + route_name, + trigger_condition_code, + trigger_condition_name, + trigger_condition_operator, + trigger_condition_value, + trigger_condition_sort, + trigger_condition_remark, + create_by, + create_time, + update_by, + update_time + from special_disease_trigger_condition + + + + + + + + insert into special_disease_trigger_condition + + route_id, + + route_name, + + trigger_condition_code, + + trigger_condition_name, + + trigger_condition_operator, + + trigger_condition_value, + + trigger_condition_sort, + + trigger_condition_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{routeId}, + + #{routeName}, + + #{triggerConditionCode}, + + #{triggerConditionName}, + + #{triggerConditionOperator}, + + #{triggerConditionValue}, + + #{triggerConditionSort}, + + #{triggerConditionRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update special_disease_trigger_condition + + route_id = + #{routeId}, + + route_name = + #{routeName}, + + trigger_condition_code = + #{triggerConditionCode}, + + trigger_condition_name = + #{triggerConditionName}, + + trigger_condition_operator = + #{triggerConditionOperator}, + + trigger_condition_value = + #{triggerConditionValue}, + + trigger_condition_sort = + #{triggerConditionSort}, + + trigger_condition_remark = + #{triggerConditionRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from special_disease_trigger_condition + where id = #{id} + + + + delete from special_disease_trigger_condition where id in + + #{id} + + + \ No newline at end of file From 3d5fb44c4bc5d94d88809e823e63cc8c490eee1d Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 18 Mar 2024 16:39:58 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/manage/service/questioninfo/IQuestionInfoService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java index 5b263f12..8db3f5a9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java @@ -6,7 +6,6 @@ import com.xinelu.manage.vo.questionInfo.QuestionVO; import java.util.List; - /** * 问卷基本信息Service接口 * From f5cdb33bede5a8f7a5747caffa895caf1576abda Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 18 Mar 2024 16:48:57 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/manage/domain/department/Department.java | 6 +++--- .../impl/SpecialDiseaseRouteServiceImpl.java | 6 +++--- .../impl/SpecialDiseaseTriggerConditionServiceImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java index cf21cff6..4e2d3884 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.Date; +import java.time.LocalDate; /** * 科室信息对象 department @@ -166,7 +166,7 @@ public class Department extends BaseEntity { @ApiModelProperty(value = "成立日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date establishDate; + private LocalDate establishDate; /** * 撤销日期 @@ -174,7 +174,7 @@ public class Department extends BaseEntity { @ApiModelProperty(value = "撤销日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date revokeDate; + private LocalDate revokeDate; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java index ccd4ee05..ac1d6d2e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -1,7 +1,6 @@ package com.xinelu.manage.service.specialdiseaseroute.impl; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; @@ -10,6 +9,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -55,7 +55,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi */ @Override public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) { - specialDiseaseRoute.setCreateTime(DateUtils.getNowDate()); + specialDiseaseRoute.setCreateTime(LocalDateTime.now()); return specialDiseaseRouteMapper.insertSpecialDiseaseRoute(specialDiseaseRoute); } @@ -67,7 +67,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi */ @Override public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) { - specialDiseaseRoute.setUpdateTime(DateUtils.getNowDate()); + specialDiseaseRoute.setUpdateTime(LocalDateTime.now()); return specialDiseaseRouteMapper.updateSpecialDiseaseRoute(specialDiseaseRoute); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java index 9cd8b60a..1edc1d97 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java @@ -1,12 +1,12 @@ package com.xinelu.manage.service.specialdiseasetriggercondition.impl; -import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; @@ -51,7 +51,7 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas */ @Override public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - specialDiseaseTriggerCondition.setCreateTime(DateUtils.getNowDate()); + specialDiseaseTriggerCondition.setCreateTime(LocalDateTime.now()); return specialDiseaseTriggerConditionMapper.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); } @@ -63,7 +63,7 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas */ @Override public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - specialDiseaseTriggerCondition.setUpdateTime(DateUtils.getNowDate()); + specialDiseaseTriggerCondition.setUpdateTime(LocalDateTime.now()); return specialDiseaseTriggerConditionMapper.updateSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); } From 8ed57967045ea60602fc4811be95a67d68b55f42 Mon Sep 17 00:00:00 2001 From: youxilong Date: Mon, 18 Mar 2024 18:48:53 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceWayContentController.java | 16 ------ .../textmessage/TextMessageController.java | 2 +- .../WechatTemplateController.java | 2 +- .../LabelFieldContentAddDTO.java | 2 + .../LabelFieldContentMapper.java | 9 ---- .../labelfieldinfo/LabelFieldInfoMapper.java | 9 ---- .../operationInfo/OperationInfoMapper.java | 9 ---- .../servicepackage/ServicePackageMapper.java | 24 +-------- .../ServicePackageContentMapper.java | 17 ------ .../ServiceWayContentMapper.java | 53 ------------------- .../mapper/textmessage/TextMessageMapper.java | 22 -------- .../wechattemplate/WechatTemplateMapper.java | 25 --------- .../ILabelFieldContentService.java | 2 - .../impl/LabelFieldContentServiceImpl.java | 3 -- .../ILabelFieldInfoService.java | 2 - .../impl/LabelFieldInfoServiceImpl.java | 3 -- .../scriptInfo/IScriptInfoService.java | 4 -- .../impl/ScriptInfoServiceImpl.java | 3 -- .../IServicePackageService.java | 4 -- .../impl/ServicePackageServiceImpl.java | 11 ++-- .../IServiceWayContentService.java | 19 ------- .../impl/ServiceWayContentServiceImpl.java | 23 ++------ .../IWechatTemplateService.java | 3 -- .../impl/WechatTemplateServiceImpl.java | 6 --- .../servicepackage/ServicePackageMapper.xml | 2 +- .../ServiceWayContentMapper.xml | 29 ---------- 26 files changed, 13 insertions(+), 291 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java index 1b608f73..97c67c2a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java @@ -37,10 +37,6 @@ public class ServiceWayContentController extends BaseController { /** * 查询服务方式列表 - * - * @param serviceWayName - * @param id - * @return */ @ApiOperation("查询服务方式列表") @GetMapping("/serviceWayList") @@ -51,9 +47,6 @@ public class ServiceWayContentController extends BaseController { /** * 根据服务方式id获取服务方式 - * - * @param id - * @return */ @ApiOperation("根据服务方式id获取服务方式") @GetMapping(value = "/serviceWay/{id}") @@ -63,9 +56,6 @@ public class ServiceWayContentController extends BaseController { /** * 新增服务方式 - * - * @param serviceWayContent - * @return */ @ApiOperation("新增服务方式") @PostMapping("/addServiceWay") @@ -75,9 +65,6 @@ public class ServiceWayContentController extends BaseController { /** * 修改服务方式 - * - * @param serviceWayContent - * @return */ @ApiOperation("修改服务方式") @PutMapping("/editServiceWay") @@ -87,9 +74,6 @@ public class ServiceWayContentController extends BaseController { /** * 根据id删除服务方式 - * - * @param id - * @return */ @ApiOperation("根据id删除服务方式") @DeleteMapping("/removeServiceWay/{id}") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java index 80ebf3af..32f9cf2d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java @@ -50,7 +50,7 @@ public class TextMessageController extends BaseController { List list = textMessageService.selectTextMessageList(textMessageDTO); //处理上面查询的list集合 int num = list.size(); - list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setRows(list); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java index 33825bf1..d4b19733 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java @@ -49,7 +49,7 @@ public class WechatTemplateController extends BaseController { List list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto); //处理上面查询的list集合 int num = list.size(); - list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setRows(list); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java index c1e315a9..3b1f91ed 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java @@ -3,6 +3,7 @@ package com.xinelu.manage.dto.labelfieldcontent; import com.xinelu.common.custominterface.Insert; import com.xinelu.common.custominterface.Update; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,6 +17,7 @@ import java.util.List; * @date : 2024/3/11 17:09 */ @Data +@ApiModel(value ="标签字段内容AddDTO") public class LabelFieldContentAddDTO { /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java index 9fe5aadc..b32368b3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java @@ -62,20 +62,11 @@ public interface LabelFieldContentMapper { /** * 检查数据库中同一个fieldId下内容名称的重复性 - * - * @param fieldId - * @param contentName - * @return */ int existCountByFieldIdAndContentName(@Param("fieldId") Long fieldId, @Param("contentName") String contentName); /** * 检查除去当前记录外有没有重复内容名称 - * - * @param id - * @param fieldId - * @param contentName - * @return */ int existCountByContentNameExcludingId(@Param("id") Long id, @Param("fieldId") Long fieldId, @Param("contentName") String contentName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java index bc5a6a2d..43a9103e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java @@ -62,20 +62,11 @@ public interface LabelFieldInfoMapper { /** * 检查同类型下有没有重复字段名称 - * - * @param fieldType - * @param fieldNames - * @return */ int countDuplicateFieldNamesByType(@Param("fieldType") String fieldType, @Param("fieldNames") List fieldNames); /** * 检查除当前记录外有没有同名的字段信息名称 - * - * @param id - * @param fieldType - * @param fieldName - * @return */ int countByFieldNameExcludingId(@Param("id") Long id, @Param("fieldType") String fieldType, @Param("fieldName") String fieldName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java index 610832d3..acb1a27e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java @@ -62,20 +62,11 @@ public interface OperationInfoMapper { /** * 检查所属科室下手术名称是否重复 - * - * @param departmentId - * @param operationName - * @return */ int countByDepartmentIdAndOperationName(@Param("departmentId") Long departmentId, @Param("operationName") String operationName); /** * 检查除当前记录之外是否存在同名的手术名称 - * - * @param id - * @param departmentId - * @param operationName - * @return */ int countByOperationNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("operationName") String operationName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackage/ServicePackageMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackage/ServicePackageMapper.java index 11ce06d3..fe9f3206 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackage/ServicePackageMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackage/ServicePackageMapper.java @@ -65,53 +65,31 @@ public interface ServicePackageMapper { /** * 根据服务包id查询服务包详情信息 - * - * @param id - * @return */ ServicePackageDetailVO selectServicePackagesById(Long id); /** * 查询服务包列表 - * - * @param servicePackage - * @return */ List selectServicePackageLists(ServicePackage servicePackage); /** * 根据服务包id查询服务包内容 - * - * @param id - * @return */ - List selectServicePackageVOListById(Long id); + List selectServicePackageVoListById(Long id); /** * 判断所属科室下服务包名称是否存在 - * - * @param departmentId - * @param packageName - * @return */ int existNameCount(@Param("departmentId") Long departmentId, @Param("packageName") String packageName); /** * 修改服务包发布状态 - * - * @param id - * @param whetherRelease - * @return */ int editReleaseStatus(@Param("id") Long id, @Param("whetherRelease") Integer whetherRelease); /** * 检查除当前记录之外是否存在同名的服务包名称 - * - * @param id - * @param departmentId - * @param packageName - * @return */ int countByPackageNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("packageName") String packageName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackagecontent/ServicePackageContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackagecontent/ServicePackageContentMapper.java index fa911f58..5d29a2e4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackagecontent/ServicePackageContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackagecontent/ServicePackageContentMapper.java @@ -63,43 +63,26 @@ public interface ServicePackageContentMapper { /** * 根据服务包id删除服务包内容 - * - * @param ids - * @return */ int deleteServicePackageContentByPackageIds(Long[] ids); /** * 根据服务包id和服务方式名称查询服务方式是否存在 - * - * @param id - * @param serviceWayName - * @return */ Long countByPackageIdAndServiceWayName(@Param("id") Long id, @Param("serviceWayName") String serviceWayName); /** * 根据服务方式id和服务内容查询服务内容是否存在 - * - * @param serviceWayId - * @param serviceContent - * @return */ Long countByServiceWayIdAndServiceContent(@Param("serviceWayId") Long serviceWayId, @Param("serviceContent") String serviceContent); /** * 根据服务内容id和服务频次查询服务频次是否存在 - * - * @param serviceContentId - * @param vo - * @return */ int countByServiceContentIdAndServiceFrequency(@Param("serviceContentId") Long serviceContentId, @Param("vo") ServicePackageContentVO vo); /** * 根据服务包id删除服务包内容 - * @param id - * @return */ int deleteServicePackageContentByPackageId(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicewaycontent/ServiceWayContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicewaycontent/ServiceWayContentMapper.java index 495cdd3c..89892e70 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicewaycontent/ServiceWayContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicewaycontent/ServiceWayContentMapper.java @@ -69,130 +69,77 @@ public interface ServiceWayContentMapper { /** * 查询服务方式列表 - * - * @param serviceWayName - * @param id - * @return */ List selectListNum(@Param("serviceWayName") String serviceWayName, @Param("id") Long id); /** * 查询服务方式内容列表 - * - * @param serviceWayContentDTO - * @return */ List selectServiceWayContentListV1(ServiceWayContentDTO serviceWayContentDTO); /** * 根据服务频次id查询服务内容和服务频次 - * - * @param id - * @return */ ServiceWayContentAndFrequencyVO selectServiceWayContentDetailByFrequencyId(Long id); /** * 查询服务方式是否存在 - * - * @param serviceWayName - * @return */ int countByServiceName(String serviceWayName); /** * 根据id删除服务方式 - * - * @param id - * @return */ int deleteServiceWayById(Long id); /** * 通过id查询服务方式 - * - * @param id - * @return */ String selectServiceWayById(Long id); - /** - * @param serviceWayContentAddDTO - * @param id - * @return - */ - int countByDTOAndContentId(@Param("DTO") ServiceWayContentAddDTO serviceWayContentAddDTO, @Param("id") Long id); /** * 修改服务方式 - * - * @param serviceWayContent - * @return */ int updateServiceWay(ServiceWayContent serviceWayContent); /** * 判断同一服务内容下服务频次是否存在 - * - * @param serviceWayContentEditDTO - * @return */ int countByEditDTO(ServiceWayContentEditDTO serviceWayContentEditDTO); /** * 根据服务频次id删除服务内容 - * - * @param id - * @return */ int deleteByFrequencyId(Long id); /** * 判断服务内容在服务内容表中是否存在 - * - * @param serviceWayId - * @param serviceContent - * @return */ ServiceWayContentVO countByWayIdAndContent(@Param("serviceWayId") Long serviceWayId, @Param("serviceContent") String serviceContent); /** * 判断服务频次在服务频次表中是否存在 - * - * @param serviceFrequencyDTO - * @return */ int countByServiceFrequencyDTO(ServiceFrequencyDTO serviceFrequencyDTO); /** * 判断当前服务方式下服务内容是否重复 - * - * @param serviceContent - * @param serviceWayId - * @return */ int selectServiceContentByName(@Param("serviceContent") String serviceContent, @Param("serviceWayId") Long serviceWayId); /** * 检查TEXT类型的serviceFrequencyText是否重复 - * - * @param serviceWayContentEditDTO - * @return */ boolean isServiceFrequencyTextDuplicate(@Param("serviceWayContentEditDTO") ServiceWayContentEditDTO serviceWayContentEditDTO); /** * 检查DIGIT类型的serviceFrequencyStart和serviceFrequencyEnd是否重复 - * - * @param serviceWayContentEditDTO - * @return */ boolean isServiceFrequencyDigitDuplicate(@Param("serviceWayContentEditDTO") ServiceWayContentEditDTO serviceWayContentEditDTO); /** * 更新服务频次 - * @param currentFrequency - * @return */ int updateServiceFrequency(ServiceWayContent currentFrequency); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java index 16e4b65a..d881bb27 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java @@ -66,58 +66,36 @@ public interface TextMessageMapper { /** * 根据id查询短信模板信息 - * - * @param id - * @return */ TextMessageVO selectTextMessageInfoById(Long id); /** * 检查短信模板信息是否存在 - * - * @param textMessageTaskDTO - * @return */ int countByTextMessageTaskDTO(TextMessageTaskDTO textMessageTaskDTO); /** * 批量插入短信模板适用任务类型 - * - * @param tasks - * @return */ int insertTextMessageSuitTasks(List tasks); /** * 批量删除短信模板适用任务类型 - * - * @param ids - * @return */ int deleteTextMessageSuitTasks(Long[] ids); /** * 修改短信模板适用任务类型 - * - * @param task - * @return */ int updateTextMessageSuitTask(@Param("task") TextMessageSuitTask task); /** * 根据id删除之前的适用任务类型 - * - * @param id */ void deleteTextMessageSuitTask(Long id); /** * 检查除当前记录之外是否存在同名的短信模板名称 - * - * @param id - * @param departmentId - * @param textMessageName - * @return */ int countByTextMessageNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("textMessageName") String textMessageName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java index a0467460..6383f245 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java @@ -66,66 +66,41 @@ public interface WechatTemplateMapper { /** * 查询微信模板信息Dto列表 - * - * @param wechatTemplateDto - * @return */ List selectWechatTemplateDtoList(WechatTemplateDTO wechatTemplateDto); /** * 根据id查询微信模板Dto - * - * @param id - * @return */ WechatTemplateVO selectWechatTemplateDtoById(@Param("id") Long id); /** * 新增微信模板适用任务类型 - * - * @param tasks - * @return */ int insertWechatTemplateSuitTask(List tasks); /** * 修改微信模板适用任务类型 - * - * @param tasks - * @return */ int updateWechatTemplateSuitTask(List tasks); /** * 批量删除微信模板使用任务类型 - * - * @param ids - * @return */ int deleteWechatTemplateSuitTaskByIds(Long[] ids); /** * 检查微信模板名称是否存在 - * - * @param wechatTemplateTaskDTO - * @return */ int countByWechatTemplateTaskDTO(WechatTemplateTaskDTO wechatTemplateTaskDTO); /** * 根据id删除之前存储的适用模板任务类型 - * - * @param id */ void deleteWechatTemplateSuitTaskById(Long id); /** * 检查除当前记录之外是否存在同名的微信模板名称 - * - * @param id - * @param departmentId - * @param wechatTemplateName - * @return */ int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java index c56f26f2..69a8e5bf 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java @@ -62,8 +62,6 @@ public interface ILabelFieldContentService { /** * 批量新增标签字段内容信息 - * @param labelFieldContentAddDTO - * @return */ int insertLabelFieldContents(LabelFieldContentAddDTO labelFieldContentAddDTO); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index c7adfb8b..e8823d0c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -110,9 +110,6 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { /** * 批量新增标签字段内容信息 - * - * @param labelFieldContentAddDTO - * @return */ @Override public int insertLabelFieldContents(LabelFieldContentAddDTO labelFieldContentAddDTO) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java index 5a6c31fc..2c7dbf5b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java @@ -62,8 +62,6 @@ public interface ILabelFieldInfoService { /** * 批量新增标签字段信息 - * @param labelFieldInfoAddDTO - * @return */ int insertLabelFieldInfoList(LabelFieldInfoAddDTO labelFieldInfoAddDTO); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index 6cc2cc85..c4fafe96 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -115,9 +115,6 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { /** * 批量新增标签字段信息 - * - * @param labelFieldInfoAddDTO - * @return */ @Transactional(rollbackFor = Exception.class) @Override diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/IScriptInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/IScriptInfoService.java index f3a2f7eb..45261a54 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/IScriptInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/IScriptInfoService.java @@ -63,10 +63,6 @@ public interface IScriptInfoService { /** * 话术图片上传 - * - * @param multipartFile - * @return - * @throws Exception */ AjaxResult uploadScriptInfo(MultipartFile multipartFile) throws Exception; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index 3118ca60..7592c262 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -120,9 +120,6 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { /** * 话术图片上传 - * - * @param multipartFile - * @return */ @Override public AjaxResult uploadScriptInfo(MultipartFile multipartFile) throws Exception { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java index 2d42d9dc..213efea9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java @@ -62,10 +62,6 @@ public interface IServicePackageService { /** * 修改服务包发布状态 - * - * @param id - * @param whetherRelease - * @return */ int editReleaseStatus(Long id, Integer whetherRelease); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java index dd858463..7351963e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import java.util.stream.Collectors; /** * 服务包基础信息Service业务层处理 @@ -56,7 +55,7 @@ public class ServicePackageServiceImpl implements IServicePackageService { ServicePackageDetailVO servicePackageDetailVO = servicePackageMapper.selectServicePackagesById(id); servicePackageDetailVO.setPackageTermAndUnit(servicePackageDetailVO.getPackageTerm() + servicePackageDetailVO.getPackageTermUnit()); // 根据服务包id查询服务包内容 - List voList = servicePackageMapper.selectServicePackageVOListById(id); + List voList = servicePackageMapper.selectServicePackageVoListById(id); servicePackageDetailVO.setVoList(voList); return servicePackageDetailVO; } @@ -71,11 +70,11 @@ public class ServicePackageServiceImpl implements IServicePackageService { public TableDataInfo selectServicePackageList(ServicePackage servicePackage) { pageServiceUtil.startPage(); List voList = servicePackageMapper.selectServicePackageLists(servicePackage); - voList.stream().peek(vo -> { + voList.forEach(vo -> { // 拼接服务包期限+服务包单位 String packageTermAndUnit = vo.getPackageTerm() + vo.getPackageTermUnit(); vo.setPackageTermAndUnit(packageTermAndUnit); - }).collect(Collectors.toList()); + }); return pageServiceUtil.getDataTable(voList); } @@ -241,10 +240,6 @@ public class ServicePackageServiceImpl implements IServicePackageService { /** * 修改服务包发布状态 - * - * @param id - * @param whetherRelease - * @return */ @Override public int editReleaseStatus(Long id, Integer whetherRelease) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/IServiceWayContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/IServiceWayContentService.java index d37f9443..b28fe244 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/IServiceWayContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/IServiceWayContentService.java @@ -67,50 +67,31 @@ public interface IServiceWayContentService { /** * 查询服务方式列表 - * - * @param serviceWayName - * @param id - * @return */ List selectListNum(String serviceWayName, Long id); /** * 新增服务方式 - * - * @param serviceWayContent - * @return */ int insertServiceWay(ServiceWayContent serviceWayContent); /** * 修改服务方式 - * - * @param serviceWayContent - * @return */ int editServiceWay(ServiceWayContent serviceWayContent); /** * 根据id删除服务方式 - * - * @param id - * @return */ int deleteServiceWayById(Long id); /** * 根据id查询服务方式 - * - * @param id - * @return */ String selectServiceWayById(Long id); /** * 根据服务频次id删除服务内容 - * - * @param id - * @return */ int deleteByFrequencyId(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java index 15808cfd..6e822db2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java @@ -3,7 +3,6 @@ package com.xinelu.manage.service.servicewaycontent.impl; import com.xinelu.common.constant.Constants; import com.xinelu.common.enums.ServiceWayContentServiceType; import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; @@ -23,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; import java.util.Objects; @@ -56,7 +54,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { * 查询服务方式内容列表 * * @param serviceWayContentDTO 服务方式内容 - * @return + * @return 服务方式内容集合 */ @Override public List selectServiceWayContentList(ServiceWayContentDTO serviceWayContentDTO) { @@ -228,10 +226,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { /** * 查询服务方式列表 - * - * @param serviceWayName - * @param id - * @return */ @Override public List selectListNum(String serviceWayName, Long id) { @@ -240,9 +234,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { /** * 新增服务方式 - * - * @param serviceWayContent - * @return */ @Override @Transactional(rollbackFor = Exception.class) @@ -263,9 +254,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { /** * 修改服务方式 - * - * @param serviceWayContent - * @return */ @Override @Transactional(rollbackFor = Exception.class) @@ -284,9 +272,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { /** * 根据id删除服务方式 - * - * @param id - * @return */ @Override public int deleteServiceWayById(Long id) { @@ -303,6 +288,9 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { return serviceWayContentMapper.deleteServiceWayById(id); } + /** + * 根据服务方式id获取服务方式 + */ @Override public String selectServiceWayById(Long id) { return serviceWayContentMapper.selectServiceWayById(id); @@ -310,9 +298,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { /** * 根据服务频次id删除服务内容 - * - * @param id - * @return */ @Override public int deleteByFrequencyId(Long id) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java index 801c6871..1dc321f6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java @@ -66,9 +66,6 @@ public interface IWechatTemplateService { /** * 根据id查询微信模板Dto - * - * @param id - * @return */ WechatTemplateTaskVO selectWechatTemplateDtoById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java index 72289ef6..7baf5fef 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java @@ -37,9 +37,6 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService { @Resource private SysDictDataMapper sysDictDataMapper; - @Resource - private PageServiceUtil pageServiceUtil; - /** * 查询微信模板信息 * @@ -222,9 +219,6 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService { /** * 根据id查询微信模板Dto - * - * @param id - * @return */ @Override public WechatTemplateTaskVO selectWechatTemplateDtoById(Long id) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml index 77dfd899..ecf5fe67 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml @@ -211,7 +211,7 @@ order by create_time DESC - - - insert into patient_visit_record @@ -173,7 +173,7 @@ - + update patient_visit_record patient_id = diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml new file mode 100644 index 00000000..907848b4 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, sign_patient_record_id, patient_id, patient_name, department_id, department_name, service_package_id, package_name, disease_type_id, disease_type_name, route_id, route_name, task_create_type, version, route_classify, suit_range, route_sort, route_remark, create_by, create_time, update_by, update_time from sign_patient_manage_route + + + + + + + + insert into sign_patient_manage_route + + sign_patient_record_id, + + patient_id, + + patient_name, + + department_id, + + department_name, + + service_package_id, + + package_name, + + disease_type_id, + + disease_type_name, + + route_id, + + route_name, + + task_create_type, + + version, + + route_classify, + + suit_range, + + route_sort, + + route_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{signPatientRecordId}, + + #{patientId}, + + #{patientName}, + + #{departmentId}, + + #{departmentName}, + + #{servicePackageId}, + + #{packageName}, + + #{diseaseTypeId}, + + #{diseaseTypeName}, + + #{routeId}, + + #{routeName}, + + #{taskCreateType}, + + #{version}, + + #{routeClassify}, + + #{suitRange}, + + #{routeSort}, + + #{routeRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update sign_patient_manage_route + + sign_patient_record_id = + #{signPatientRecordId}, + + patient_id = + #{patientId}, + + patient_name = + #{patientName}, + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + service_package_id = + #{servicePackageId}, + + package_name = + #{packageName}, + + disease_type_id = + #{diseaseTypeId}, + + disease_type_name = + #{diseaseTypeName}, + + route_id = + #{routeId}, + + route_name = + #{routeName}, + + task_create_type = + #{taskCreateType}, + + version = + #{version}, + + route_classify = + #{routeClassify}, + + suit_range = + #{suitRange}, + + route_sort = + #{routeSort}, + + route_remark = + #{routeRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from sign_patient_manage_route where id = #{id} + + + + delete from sign_patient_manage_route where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml new file mode 100644 index 00000000..d7779776 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -0,0 +1,708 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, manage_route_id, manage_route_name, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name, question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template__id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link, create_by, create_time, update_by, update_time from sign_patient_manage_route_node + + + + + + + + insert into sign_patient_manage_route_node + + manage_route_id, + + manage_route_name, + + route_node_name, + + route_node_day, + + task_type, + + task_status, + + task_subdivision, + + second_classify_describe, + + execute_time, + + phone_push_sign, + + phone_id, + + phone_template_id, + + phone_template_name, + + phone_node_content, + + phone_redial_times, + + phone_time_interval, + + phone_message_remind, + + phone_message_template_id, + + phone_message_template_name, + + question_info_id, + + questionnaire_name, + + questionnaire_content, + + question_expiration_date, + + propaganda_info_id, + + propaganda_title, + + propaganda_content, + + message_push_sign, + + message_template__id, + + message_template_name, + + message_preview, + + message_node_content, + + official_push_sign, + + official_template_id, + + official_template_name, + + official_remind_content, + + official_node_content, + + applet_push_sign, + + applet_template_id, + + applet_template_name, + + applet_remind_content, + + applet_prompt_description, + + applet_node_content, + + follow_template_id, + + follow_template_name, + + follow_content, + + route_check_status, + + route_check_person, + + route_check_date, + + route_check_remark, + + route_node_remark, + + node_execute_status, + + route_handle_remark, + + route_handle_id, + + route_handle_person, + + route_link, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{manageRouteId}, + + #{manageRouteName}, + + #{routeNodeName}, + + #{routeNodeDay}, + + #{taskType}, + + #{taskStatus}, + + #{taskSubdivision}, + + #{secondClassifyDescribe}, + + #{executeTime}, + + #{phonePushSign}, + + #{phoneId}, + + #{phoneTemplateId}, + + #{phoneTemplateName}, + + #{phoneNodeContent}, + + #{phoneRedialTimes}, + + #{phoneTimeInterval}, + + #{phoneMessageRemind}, + + #{phoneMessageTemplateId}, + + #{phoneMessageTemplateName}, + + #{questionInfoId}, + + #{questionnaireName}, + + #{questionnaireContent}, + + #{questionExpirationDate}, + + #{propagandaInfoId}, + + #{propagandaTitle}, + + #{propagandaContent}, + + #{messagePushSign}, + + #{messageTemplateId}, + + #{messageTemplateName}, + + #{messagePreview}, + + #{messageNodeContent}, + + #{officialPushSign}, + + #{officialTemplateId}, + + #{officialTemplateName}, + + #{officialRemindContent}, + + #{officialNodeContent}, + + #{appletPushSign}, + + #{appletTemplateId}, + + #{appletTemplateName}, + + #{appletRemindContent}, + + #{appletPromptDescription}, + + #{appletNodeContent}, + + #{followTemplateId}, + + #{followTemplateName}, + + #{followContent}, + + #{routeCheckStatus}, + + #{routeCheckPerson}, + + #{routeCheckDate}, + + #{routeCheckRemark}, + + #{routeNodeRemark}, + + #{nodeExecuteStatus}, + + #{routeHandleRemark}, + + #{routeHandleId}, + + #{routeHandlePerson}, + + #{routeLink}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + insert into sign_patient_manage_route_node(manage_route_id, manage_route_name, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, + execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, + phone_message_template_name, question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, + message_template__id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, + official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, + follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, + route_handle_id, route_handle_person, route_link, create_by, create_time, update_by, update_time) + values + + (#{item.manageRouteId},#{item.manageRouteName},#{item.routeNodeName},#{item.routeNodeDay},#{item.taskType},#{item.taskStatus},#{item.taskSubdivision},#{item.secondClassifyDescribe}, + #{item.executeTime},#{item.phonePushSign},#{item.phoneId},#{item.phoneTemplateId},#{item.phoneTemplateName},#{item.phoneNodeContent},#{item.phoneRedialTimes},#{item.phoneTimeInterval},#{item.phoneMessageRemind},#{item.phoneMessageTemplateId},#{item.phoneMessageTemplateName}, + #{item.questionInfoId},#{item.questionnaireName},#{item.questionnaireContent},#{item.questionExpirationDate},#{item.propagandaInfoId},#{item.propagandaTitle},#{item.propagandaContent},#{item.messagePushSign},#{item.messageTemplateId}, + #{item.messageTemplateName},#{item.messagePreview},#{item.messageNodeContent},#{item.officialPushSign},#{item.officialTemplateId},#{item.officialTemplateName},#{item.officialRemindContent},#{item.officialNodeContent}, + #{item.appletPushSign},#{item.appletTemplateId},#{item.appletTemplateName},#{item.appletRemindContent},#{item.appletPromptDescription},#{item.appletNodeContent},#{item.followTemplateId}, + #{item.followTemplateName},#{item.followContent},#{item.routeCheckStatus},#{item.routeCheckPerson},#{item.routeCheckDate},#{item.routeCheckRemark},#{item.routeNodeRemark},#{item.nodeExecuteStatus},#{item.routeHandleRemark}, + #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) + + + + update sign_patient_manage_route_node + + manage_route_id = + #{manageRouteId}, + + manage_route_name = + #{manageRouteName}, + + route_node_name = + #{routeNodeName}, + + route_node_day = + #{routeNodeDay}, + + task_type = + #{taskType}, + + task_status = + #{taskStatus}, + + task_subdivision = + #{taskSubdivision}, + + second_classify_describe = + #{secondClassifyDescribe}, + + execute_time = + #{executeTime}, + + phone_push_sign = + #{phonePushSign}, + + phone_id = + #{phoneId}, + + phone_template_id = + #{phoneTemplateId}, + + phone_template_name = + #{phoneTemplateName}, + + phone_node_content = + #{phoneNodeContent}, + + phone_redial_times = + #{phoneRedialTimes}, + + phone_time_interval = + #{phoneTimeInterval}, + + phone_message_remind = + #{phoneMessageRemind}, + + phone_message_template_id = + #{phoneMessageTemplateId}, + + phone_message_template_name = + #{phoneMessageTemplateName}, + + question_info_id = + #{questionInfoId}, + + questionnaire_name = + #{questionnaireName}, + + questionnaire_content = + #{questionnaireContent}, + + question_expiration_date = + #{questionExpirationDate}, + + propaganda_info_id = + #{propagandaInfoId}, + + propaganda_title = + #{propagandaTitle}, + + propaganda_content = + #{propagandaContent}, + + message_push_sign = + #{messagePushSign}, + + message_template__id = + #{messageTemplateId}, + + message_template_name = + #{messageTemplateName}, + + message_preview = + #{messagePreview}, + + message_node_content = + #{messageNodeContent}, + + official_push_sign = + #{officialPushSign}, + + official_template_id = + #{officialTemplateId}, + + official_template_name = + #{officialTemplateName}, + + official_remind_content = + #{officialRemindContent}, + + official_node_content = + #{officialNodeContent}, + + applet_push_sign = + #{appletPushSign}, + + applet_template_id = + #{appletTemplateId}, + + applet_template_name = + #{appletTemplateName}, + + applet_remind_content = + #{appletRemindContent}, + + applet_prompt_description = + #{appletPromptDescription}, + + applet_node_content = + #{appletNodeContent}, + + follow_template_id = + #{followTemplateId}, + + follow_template_name = + #{followTemplateName}, + + follow_content = + #{followContent}, + + route_check_status = + #{routeCheckStatus}, + + route_check_person = + #{routeCheckPerson}, + + route_check_date = + #{routeCheckDate}, + + route_check_remark = + #{routeCheckRemark}, + + route_node_remark = + #{routeNodeRemark}, + + node_execute_status = + #{nodeExecuteStatus}, + + route_handle_remark = + #{routeHandleRemark}, + + route_handle_id = + #{routeHandleId}, + + route_handle_person = + #{routeHandlePerson}, + + route_link = + #{routeLink}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from sign_patient_manage_route_node where id = #{id} + + + + delete from sign_patient_manage_route_node where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index 12760267..f3b7536d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -401,10 +401,12 @@ sign.campus_agency_name,sign.department_name, sign.ward_name,sign.visit_serial_number, sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, - sign.service_status,sign.sign_status,sign.payment_status,sign.price, - p.service_package_id, p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time, p.service_cycle + sign.service_status,sign.sign_status,sign.payment_status,sign.price,sign.health_manage_id,sign.health_manage_name, + p.service_package_id, p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time, + p.package_term, p.package_term_unit, route.route_id, route.route_name from sign_patient_record sign left join sign_patient_package p on p.sign_patient_record_id = sign.id + left join sign_patient_manage_route route on route.sign_patient_record_id = sign.id sign.del_flag = 0 and sign.id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml new file mode 100644 index 00000000..6f516417 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + select id, patient_manage_route_id, route_name, trigger_condition_code, trigger_condition_name, trigger_condition_operator, trigger_condition_value, trigger_condition_sort, trigger_condition_remark, create_by, create_time, update_by, update_time from sign_route_trigger_condition + + + + + + + + insert into sign_route_trigger_condition + + patient_manage_route_id, + + route_name, + + trigger_condition_code, + + trigger_condition_name, + + trigger_condition_operator, + + trigger_condition_value, + + trigger_condition_sort, + + trigger_condition_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientManageRouteId}, + + #{routeName}, + + #{triggerConditionCode}, + + #{triggerConditionName}, + + #{triggerConditionOperator}, + + #{triggerConditionValue}, + + #{triggerConditionSort}, + + #{triggerConditionRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update sign_route_trigger_condition + + patient_manage_route_id = + #{patientManageRouteId}, + + route_name = + #{routeName}, + + trigger_condition_code = + #{triggerConditionCode}, + + trigger_condition_name = + #{triggerConditionName}, + + trigger_condition_operator = + #{triggerConditionOperator}, + + trigger_condition_value = + #{triggerConditionValue}, + + trigger_condition_sort = + #{triggerConditionSort}, + + trigger_condition_remark = + #{triggerConditionRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from sign_route_trigger_condition where id = #{id} + + + + delete from sign_route_trigger_condition where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml index f17af4d5..248338df 100644 --- a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -119,6 +119,9 @@ AND u.phonenumber like concat('%', #{phonenumber}, '%') + + and u.post_name = #{userBirthDate} + AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') From 410f5a8b07aec6cd992f9064c401f9b1f5a4b785 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 19 Mar 2024 09:17:23 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PatientVisitRecordServiceImpl.java | 22 +++------------- .../impl/SignPatientRecordServiceImpl.java | 26 ++++++++++++++----- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 9646175f..9f538fb8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -5,7 +5,6 @@ import com.xinelu.common.constant.NodeTypeConstants; import com.xinelu.common.constant.VisitTypeConstants; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.bean.BeanUtils; @@ -24,6 +23,7 @@ import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -85,7 +85,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Override public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord) { patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientVisitRecord.setCreateTime(DateUtils.getNowDate()); + patientVisitRecord.setCreateTime(LocalDateTime.now()); return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); } @@ -106,22 +106,6 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); return 0; } - @Override public int saveRecord(PatientVisitRecordSaveDto saveDto) { - PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); - // 查询患者信息 - PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId()); - BeanUtils.copyBeanProp(patientVisitRecord, patientInfo); - patientMapper.updatePatientInfo(patientInfo); - BeanUtils.copyBeanProp(patientVisitRecord, saveDto); - patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientVisitRecord.setCreateTime(DateUtils.getNowDate()); - // 住院时间，出院时间-入院时间 - LocalDate admissionTime = saveDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - LocalDate dischargeTime = saveDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime); - patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); - } /** * 修改患者就诊记录基本信息 @@ -184,7 +168,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService for (PatientVisitRecordImportDto item : importDataList) { PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); BeanUtils.copyProperties(item, patientVisitRecord); - patientVisitRecord.setCreateTime(DateUtils.getNowDate()); + patientVisitRecord.setCreateTime(LocalDateTime.now()); patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); switch (patientType) { // 在院患者 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index 90513ac1..aa0a921b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -4,7 +4,6 @@ import com.xinelu.common.constant.PaymentStatusConstants; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.constant.TaskCreateTypeConstant; import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.bean.BeanUtils; @@ -25,6 +24,8 @@ import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.servicepackage.ServicePackageMapper; import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; +import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper; +import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper; import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; @@ -34,6 +35,7 @@ import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -65,6 +67,16 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { private SignPatientPackageHardwareMapper signPatientPackageHardwareMapper; @Resource private SignPatientInformedMapper signPatientInformedMapper; + @Resource + private ServicePackageMapper servicePackageMapper; + @Resource + private SpecialDiseaseRouteMapper specialDiseaseRouteMapper; + @Resource + private SignPatientManageRouteMapper signPatientManageRouteMapper; + @Resource + private SpecialDiseaseNodeMapper specialDiseaseNodeMapper; + @Resource + private SignPatientManageRouteNodeMapper manageRouteNodeMapper; @Override public List selectList(SignPatientListDto signPatientRecord) { return signPatientRecordMapper.selectList(signPatientRecord); @@ -109,10 +121,10 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER); signPatientRecord.setDelFlag(0); signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES); - signPatientRecord.setSignTime(DateUtils.getNowDate()); + signPatientRecord.setSignTime(LocalDateTime.now()); signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); signPatientRecord.setPrice(signPatientPackageDto.getPackagePrice()); - signPatientRecord.setCreateTime(DateUtils.getNowDate()); + signPatientRecord.setCreateTime(LocalDateTime.now()); signPatientRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); // 保存签约记录 int flag = signPatientRecordMapper.insert(signPatientRecord); @@ -121,7 +133,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { patient.setSignPatientRecordId(signPatientRecord.getId()); patient.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); patient.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER); - patient.setSignTime(DateUtils.getNowDate()); + patient.setSignTime(LocalDateTime.now()); patientInfoMapper.updatePatientInfo(patient); if (flag > 0) { // 保存签约服务包信息 @@ -134,7 +146,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signPatientPackage.setSignPatientRecordId(signPatientRecord.getId()); signPatientPackage.setPatientId(signPatientRecord.getPatientId()); signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES); - signPatientPackage.setCreateTime(DateUtils.getNowDate()); + signPatientPackage.setCreateTime(LocalDateTime.now()); signPatientPackage.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); signPatientPackage.setId(null); signPatientPackageMapper.insertSignPatientPackage(signPatientPackage); @@ -147,7 +159,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signPatientManageRoute.setSignPatientRecordId(signPatientRecord.getId()); signPatientManageRoute.setRouteId(specialDiseaseRoute.getId()); signPatientManageRoute.setTaskCreateType(TaskCreateTypeConstant.MANUAL_MATCHE); - signPatientManageRoute.setCreateTime(DateUtils.getNowDate()); + signPatientManageRoute.setCreateTime(LocalDateTime.now()); signPatientManageRoute.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute); // 保存管理节点 @@ -161,7 +173,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { SignPatientManageRouteNode manageRouteNode = new SignPatientManageRouteNode(); BeanUtils.copyBeanProp(manageRouteNode, node); manageRouteNode.setManageRouteId(body.getRouteId()); - manageRouteNode.setCreateTime(DateUtils.getNowDate()); + manageRouteNode.setCreateTime(LocalDateTime.now()); manageRouteNode.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); return manageRouteNode; }).collect(Collectors.toList()); From dac6412d6c7b4f94bc1d5bfd1c15db4411e0908e Mon Sep 17 00:00:00 2001 From: youxilong Date: Tue, 19 Mar 2024 10:29:15 +0800 Subject: [PATCH 09/32] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/common/constant/Constants.java | 10 +++++++ .../LabelFieldInfoFieldTypeConstants.java | 29 ------------------- .../xinelu/common/enums/HardWareTypeEnum.java | 25 ++++++++++++++++ .../common/enums/LabelFieldTypeEnum.java | 20 +++++++++++++ .../xinelu/common/enums/ScriptStatusEnum.java | 25 ++++++++++++++++ .../enums/ServiceFrequencyTypeEnum.java | 20 +++++++++++++ ...tServiceType.java => ServiceTypeEnum.java} | 14 ++------- .../common/enums/TextMessageChannelEnum.java | 15 ++++++++++ .../common/enums/TextMessageStatusEnum.java | 20 +++++++++++++ .../enums/WeChatTemplateSourceEnum.java | 21 ++++++++++++++ .../impl/LabelFieldContentServiceImpl.java | 4 +-- .../impl/LabelFieldInfoServiceImpl.java | 4 +-- .../impl/ServiceWayContentServiceImpl.java | 17 ++++++----- 13 files changed, 171 insertions(+), 53 deletions(-) delete mode 100644 postdischarge-common/src/main/java/com/xinelu/common/constant/LabelFieldInfoFieldTypeConstants.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java rename postdischarge-common/src/main/java/com/xinelu/common/enums/{ServiceWayContentServiceType.java => ServiceTypeEnum.java} (57%) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index d41889f7..b56cc41f 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -208,4 +208,14 @@ public class Constants { * 出院 */ public static final String DISCHARGED = "discharged"; + + /** + * 字段信息编码前缀 + */ + public static final String FIELD_ENCODING = "FE"; + + /** + * 字段内容编码前缀 + */ + public static final String CONTENT_ENCODING = "CE"; } diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/LabelFieldInfoFieldTypeConstants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/LabelFieldInfoFieldTypeConstants.java deleted file mode 100644 index 0bbaa866..00000000 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/LabelFieldInfoFieldTypeConstants.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.xinelu.common.constant; - -/** - * 字段标签信息字段类型 - * - * @author : youxilong - * @date : 2024/3/11 10:19 - */ -public class LabelFieldInfoFieldTypeConstants { - /** - * 画像标签字段 - */ - public static final String PORTRAIT_LABEL_FIELD = "PORTRAIT_LABEL_FIELD"; - - /** - * 知识库字段 - */ - public static final String KNOWLEDGE_FIELD = "KNOWLEDGE_FIELD"; - - /** - * 字段信息编码前缀 - */ - public static final String FIELD_ENCODING = "FE"; - - /** - * 字段内容编码前缀 - */ - public static final String CONTENT_ENCODING = "CE"; -} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java new file mode 100644 index 00000000..d843676e --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java @@ -0,0 +1,25 @@ +package com.xinelu.common.enums; + +/** + * 硬件类型标识 + * + * @author : youxilong + * @date : 2024/3/19 10:09 + */ +public enum HardWareTypeEnum { + + /** + * 硬件类型:血压仪 + */ + BLOOD_PRESSURE, + + /** + * 硬件类型:血糖仪 + */ + GLUCOSE_METER, + + /** + * 硬件类型:心电仪 + */ + ELECTROCARDIOGRA +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java new file mode 100644 index 00000000..cae16b00 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java @@ -0,0 +1,20 @@ +package com.xinelu.common.enums; + +/** + * 字段类型标识 + * + * @author : youxilong + * @date : 2024/3/19 10:22 + */ +public enum LabelFieldTypeEnum { + + /** + * 字段类型:画像标签字段 + */ + PORTRAIT_LABEL_FIELD, + + /** + * 字段类型:知识库字段 + */ + KNOWLEDGE_FIELD +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java new file mode 100644 index 00000000..cdc5fb1f --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java @@ -0,0 +1,25 @@ +package com.xinelu.common.enums; + +/** + * 话术状态标识 + * + * @author : youxilong + * @date : 2024/3/19 10:06 + */ +public enum ScriptStatusEnum { + + /** + * 话术状态，正常 + */ + NORMAL, + + /** + * 话术状态:下架 + */ + OFF_SHELF, + + /** + * 话术状态:暂停 + */ + SUSPEND +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java new file mode 100644 index 00000000..e8d7a93f --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java @@ -0,0 +1,20 @@ +package com.xinelu.common.enums; + +/** + * 服务频次标识 + * + * @author : youxilong + * @date : 2024/3/19 10:12 + */ +public enum ServiceFrequencyTypeEnum { + + /** + * 服务频次类型：数字：DIGIT + */ + DIGIT, + + /** + * 服务频次类型：文本：TEXT + */ + TEXT +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceWayContentServiceType.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceTypeEnum.java similarity index 57% rename from postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceWayContentServiceType.java rename to postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceTypeEnum.java index 985ddcbe..f2ef49e7 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceWayContentServiceType.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceTypeEnum.java @@ -6,7 +6,7 @@ package com.xinelu.common.enums; * @author : youxilong * @date : 2024/2/29 20:08 */ -public enum ServiceWayContentServiceType { +public enum ServiceTypeEnum { /** * 服务方式 @@ -21,16 +21,6 @@ public enum ServiceWayContentServiceType { /** * 服务频次 */ - SERVICE_FREQUENCY, - - /** - * 服务频次类型：数字：DIGIT - */ - DIGIT, - - /** - * 服务频次类型：文本：TEXT - */ - TEXT + SERVICE_FREQUENCY } diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java new file mode 100644 index 00000000..45ecb75c --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java @@ -0,0 +1,15 @@ +package com.xinelu.common.enums; + +/** + * 短信通道标识 + * + * @author : youxilong + * @date : 2024/3/19 10:14 + */ +public enum TextMessageChannelEnum { + + /** + * 短信通道：水滴平台 + */ + WATER_DROPLET_PLATFORM +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java new file mode 100644 index 00000000..4c1a23b3 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java @@ -0,0 +1,20 @@ +package com.xinelu.common.enums; + +/** + * 短信状态标识 + * + * @author : youxilong + * @date : 2024/3/19 10:15 + */ +public enum TextMessageStatusEnum { + + /** + * 短信状态:上架 + */ + GROUNDING, + + /** + * 短信状态:下架： + */ + OFF_SHELF +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java new file mode 100644 index 00000000..daa49c6b --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java @@ -0,0 +1,21 @@ +package com.xinelu.common.enums; + +/** + * 微信模板来源 + * + * @author : youxilong + * @date : 2024/3/19 10:19 + */ +public enum WeChatTemplateSourceEnum { + + /** + * 模板来源:小程序 + */ + WE_CHAT_APPLET, + + /** + * 模板来源:公众号 + */ + WE_CHAT_OFFICIAL_ACCOUNT + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index e8823d0c..b5c665fe 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -1,6 +1,6 @@ package com.xinelu.manage.service.labelfieldcontent.impl; -import com.xinelu.common.constant.LabelFieldInfoFieldTypeConstants; +import com.xinelu.common.constant.Constants; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; @@ -128,7 +128,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { BeanUtils.copyProperties(contentDTO, labelFieldContent); labelFieldContent.setFieldId(labelFieldContentAddDTO.getFieldId()); labelFieldContent.setFieldName(labelFieldContentAddDTO.getFieldName()); - labelFieldContent.setContentCode(LabelFieldInfoFieldTypeConstants.CONTENT_ENCODING + systemCodeUtil.generateDepartCode(LabelFieldInfoFieldTypeConstants.CONTENT_ENCODING)); + labelFieldContent.setContentCode(Constants.CONTENT_ENCODING + systemCodeUtil.generateDepartCode(Constants.CONTENT_ENCODING)); labelFieldContent.setCreateBy(SecurityUtils.getUsername()); labelFieldContent.setCreateTime(LocalDateTime.now()); if (labelFieldContentMapper.insertLabelFieldContent(labelFieldContent) <= 0) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index c4fafe96..89a7a503 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -1,6 +1,6 @@ package com.xinelu.manage.service.labelfieldinfo.impl; -import com.xinelu.common.constant.LabelFieldInfoFieldTypeConstants; +import com.xinelu.common.constant.Constants; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; @@ -142,7 +142,7 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { } // 如果不存在，执行新增操作 for (LabelFieldInfo labelFieldInfo : fieldInfoList) { - labelFieldInfo.setFieldCode(LabelFieldInfoFieldTypeConstants.FIELD_ENCODING + systemCodeUtil.generateDepartCode(LabelFieldInfoFieldTypeConstants.FIELD_ENCODING)); + labelFieldInfo.setFieldCode(Constants.FIELD_ENCODING + systemCodeUtil.generateDepartCode(Constants.FIELD_ENCODING)); labelFieldInfo.setCreateBy(SecurityUtils.getUsername()); labelFieldInfo.setCreateTime(LocalDateTime.now()); if (labelFieldInfoMapper.insertLabelFieldInfo(labelFieldInfo) <= 0) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java index 6e822db2..740b0fc9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java @@ -1,7 +1,8 @@ package com.xinelu.manage.service.servicewaycontent.impl; import com.xinelu.common.constant.Constants; -import com.xinelu.common.enums.ServiceWayContentServiceType; +import com.xinelu.common.enums.ServiceFrequencyTypeEnum; +import com.xinelu.common.enums.ServiceTypeEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; @@ -85,7 +86,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { throw new ServiceException("当前服务内容下服务频次已存在"); } // 如果当前服务内容下服务频次不存在，新增服务频次 - serviceFrequency.setServiceType(ServiceWayContentServiceType.SERVICE_FREQUENCY.toString()); + serviceFrequency.setServiceType(ServiceTypeEnum.SERVICE_FREQUENCY.toString()); serviceFrequency.setServiceContentId(serviceWayContentVO.getId()); serviceFrequency.setServiceFrequencyType(serviceWayContentAddDTO.getServiceFrequencyType()); serviceFrequency.setServiceFrequencyText(serviceWayContentAddDTO.getServiceFrequencyText()); @@ -100,7 +101,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { // 如果服务内容在服务内容表不存在，新增服务内容，新增服务频次 // 新增服务内容 ServiceWayContent serviceContent = new ServiceWayContent(); - serviceContent.setServiceType(ServiceWayContentServiceType.SERVICE_CONTENT.toString()); + serviceContent.setServiceType(ServiceTypeEnum.SERVICE_CONTENT.toString()); serviceContent.setServiceWayId(serviceWayContentAddDTO.getServiceWayId()); serviceContent.setServiceContent(serviceWayContentAddDTO.getServiceContent()); serviceContent.setCreateBy(username); @@ -109,7 +110,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { throw new ServiceException("新增服务内容失败"); } // 新增服务频次 - serviceFrequency.setServiceType(ServiceWayContentServiceType.SERVICE_FREQUENCY.toString()); + serviceFrequency.setServiceType(ServiceTypeEnum.SERVICE_FREQUENCY.toString()); serviceFrequency.setServiceContentId(serviceContent.getId()); serviceFrequency.setServiceFrequencyType(serviceWayContentAddDTO.getServiceFrequencyType()); serviceFrequency.setServiceFrequencyText(serviceWayContentAddDTO.getServiceFrequencyText()); @@ -159,7 +160,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { ServiceWayContent newServiceContent = new ServiceWayContent(); newServiceContent.setServiceWayId(serviceWayContentEditDTO.getServiceWayId()); newServiceContent.setServiceContent(serviceWayContentEditDTO.getServiceContent()); - newServiceContent.setServiceType(ServiceWayContentServiceType.SERVICE_CONTENT.toString()); + newServiceContent.setServiceType(ServiceTypeEnum.SERVICE_CONTENT.toString()); newServiceContent.setCreateBy(username); newServiceContent.setCreateTime(LocalDateTime.now()); serviceWayContentMapper.insertServiceWayContent(newServiceContent); @@ -176,9 +177,9 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { // 如果服务频次改变了，检查新服务频次的重复性 if (serviceFrequencyChanged) { boolean isFrequencyDuplicate = false; - if (ServiceWayContentServiceType.TEXT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) { + if (ServiceFrequencyTypeEnum.TEXT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) { isFrequencyDuplicate = serviceWayContentMapper.isServiceFrequencyTextDuplicate(serviceWayContentEditDTO); - } else if (ServiceWayContentServiceType.DIGIT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) { + } else if (ServiceFrequencyTypeEnum.DIGIT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) { isFrequencyDuplicate = serviceWayContentMapper.isServiceFrequencyDigitDuplicate(serviceWayContentEditDTO); } if (isFrequencyDuplicate) { @@ -246,7 +247,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService { } // 如果不存在，执行新增功能 serviceWayContent.setServiceWayCode(Constants.SERVICE_MODE_ENCODING + systemCodeUtil.generateDepartCode(Constants.SERVICE_MODE_ENCODING)); - serviceWayContent.setServiceType(ServiceWayContentServiceType.SERVICE_WRY.toString()); + serviceWayContent.setServiceType(ServiceTypeEnum.SERVICE_WRY.toString()); serviceWayContent.setCreateBy(SecurityUtils.getUsername()); serviceWayContent.setCreateTime(LocalDateTime.now()); return serviceWayContentMapper.insertServiceWayContent(serviceWayContent); From 8e8e40bc1e698e017871e1574d4a5bfbbeeb2423 Mon Sep 17 00:00:00 2001 From: youxilong Date: Tue, 19 Mar 2024 10:55:10 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servicepackage/ServicePackageController.java | 4 ---- .../manage/mapper/scriptInfo/ScriptInfoMapper.java | 9 +-------- .../mapper/wechattemplate/WechatTemplateMapper.java | 2 +- .../service/scriptInfo/impl/ScriptInfoServiceImpl.java | 2 +- .../service/wechattemplate/IWechatTemplateService.java | 4 +--- .../wechattemplate/impl/WechatTemplateServiceImpl.java | 3 +-- .../mapper/manage/scriptInfo/ScriptInfoMapper.xml | 4 +++- .../manage/wechattemplate/WechatTemplateMapper.xml | 2 ++ 8 files changed, 10 insertions(+), 20 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java index 75276816..2634c02f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java @@ -101,10 +101,6 @@ public class ServicePackageController extends BaseController { /** * 修改服务包发布状态 - * - * @param id - * @param whetherRelease - * @return */ @ApiOperation("修改服务包发布状态") @PutMapping("/editReleaseStatus") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java index 7ffea3d8..198b8d3d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java @@ -62,18 +62,11 @@ public interface ScriptInfoMapper { /** * 判断通用话术名称是否存在 - * - * @param scriptInfo - * @return */ int countByScriptInfo(ScriptInfo scriptInfo); /** * 检查是否存在除当前记录之外的同名记录 - * @param scriptName - * @param departmentId - * @param id - * @return */ - int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id); + int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id, @Param("commonScriptName") String commonScriptName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java index 6383f245..63649d57 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java @@ -102,5 +102,5 @@ public interface WechatTemplateMapper { /** * 检查除当前记录之外是否存在同名的微信模板名称 */ - int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName); + int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName, @Param("templateSource") String templateSource); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index 7592c262..b515ff03 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -84,7 +84,7 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { @Transactional(rollbackFor = Exception.class) public int updateScriptInfo(ScriptInfo scriptInfo) { // 检查除当前记录之外是否存在同名的话术名称 - if (scriptInfoMapper.countByScriptNameExcludingId(scriptInfo.getCommonScriptName(), scriptInfo.getDepartmentId(), scriptInfo.getId()) > 0) { + if (scriptInfoMapper.countByScriptNameExcludingId(scriptInfo.getScriptName(), scriptInfo.getDepartmentId(), scriptInfo.getId(),scriptInfo.getCommonScriptName()) > 0) { // 存在同名的通用话术名称，不能进行更新 throw new ServiceException("通用话术名称已存在，请使用其他名称。"); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java index 1dc321f6..824bb5cd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java @@ -1,11 +1,9 @@ package com.xinelu.manage.service.wechattemplate; -import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.wechattemplate.WechatTemplate; import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO; import com.xinelu.manage.dto.wechattemplate.WechatTemplateTaskDTO; import com.xinelu.manage.vo.wechattemplate.WechatTemplateTaskVO; -import com.xinelu.manage.vo.wechattemplate.WechatTemplateVO; import java.util.List; @@ -65,7 +63,7 @@ public interface IWechatTemplateService { public int deleteWechatTemplateById(Long id); /** - * 根据id查询微信模板Dto + * 根据id查询微信模板 */ WechatTemplateTaskVO selectWechatTemplateDtoById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java index 7baf5fef..f7b2d3c3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java @@ -2,7 +2,6 @@ package com.xinelu.manage.service.wechattemplate.impl; import com.xinelu.common.core.domain.entity.SysDictData; import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.wechattemplate.WechatTemplate; @@ -148,7 +147,7 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService { @Transactional(rollbackFor = Exception.class) public int updateWechatTemplate(WechatTemplateTaskDTO wechatTemplateTaskDTO) { // 检查除当前记录之外是否存在同名的微信模板名称 - if (wechatTemplateMapper.countByWechatTemplateNameExcludingId(wechatTemplateTaskDTO.getId(), wechatTemplateTaskDTO.getDepartmentId(), wechatTemplateTaskDTO.getWechatTemplateName()) > 0) { + if (wechatTemplateMapper.countByWechatTemplateNameExcludingId(wechatTemplateTaskDTO.getId(), wechatTemplateTaskDTO.getDepartmentId(), wechatTemplateTaskDTO.getWechatTemplateName(), wechatTemplateTaskDTO.getTemplateSource()) > 0) { throw new ServiceException("微信模板名称已存在"); } // 设置修改者和修改时间 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml index 5e82e0bc..23edb95d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml @@ -126,13 +126,15 @@ from script_info where department_id = #{departmentId} and common_script_name = #{commonScriptName} + and script_name = #{scriptName} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml index ca72b4b7..b8d371cd 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml @@ -181,6 +181,7 @@ from wechat_template wt where department_id = #{departmentId} and wechat_template_name = #{wechatTemplateName} + and template_source = #{templateSource} From 22c2446b35306ba8dbaabcdc9ddb6d082c8a9a2f Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 19 Mar 2024 15:55:34 +0800 Subject: [PATCH 11/32] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/AgencyCategoryManageLevelEnum.java | 34 ++++++++++ .../xinelu/common/enums/AgencyStatusEnum.java | 29 +++++++++ .../com/xinelu/common/enums/NodeTypeEnum.java | 64 +++++++++++++++++++ ...cialDiseaseTriggerConditionController.java | 5 +- .../TriggerConditionDTO.java | 21 ++++++ .../SpecialDiseaseTriggerConditionMapper.java | 20 ++++-- ...SignPatientManageRouteNodeServiceImpl.java | 4 +- ...SpecialDiseaseTriggerConditionService.java | 15 +++-- ...ialDiseaseTriggerConditionServiceImpl.java | 11 ++-- .../SpecialDiseaseTriggerConditionMapper.xml | 29 +++++++++ 10 files changed, 211 insertions(+), 21 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java new file mode 100644 index 00000000..69bcebc4 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java @@ -0,0 +1,34 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 机构分类管理类别 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum AgencyCategoryManageLevelEnum { + + /** + * 非营利性医疗机构 + */ + NON_PROFIT_MEDICAL_AGENCY("NON_PROFIT_MEDICAL_AGENCY"), + + /** + * 营利性医疗机构 + */ + FOR_PROFIT_MEDICAL_AGENCY("FOR_PROFIT_MEDICAL_AGENCY"), + + /** + * 其他卫生机构 + */ + OTHER_HEALTH_AGENCY("OTHER_HEALTH_AGENCY"), + ; + + final private String info; + + AgencyCategoryManageLevelEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java new file mode 100644 index 00000000..2de1d909 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java @@ -0,0 +1,29 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 机构状态 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum AgencyStatusEnum { + + /** + * 启用 + */ + ON("ON"), + + /** + * 禁用 + */ + OFF("OFF"), + ; + + final private String info; + + AgencyStatusEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java new file mode 100644 index 00000000..6bdd3148 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java @@ -0,0 +1,64 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 节点类型 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum NodeTypeEnum { + + /** + * 卫健委 + */ + HEALTH_COMMISSION("HEALTH_COMMISSION"), + + /** + * 医保局 + */ + MEDICAL_INSURANCE_BUREAU("MEDICAL_INSURANCE_BUREAU"), + + /** + * 医院 + */ + HOSPITAL("HOSPITAL"), + + /** + * 院区 + */ + CAMPUS("CAMPUS"), + + /** + * 药店 + */ + PHARMACY("PHARMACY"), + + /** + * 科室 + */ + DEPARTMENT("DEPARTMENT"), + + /** + * 病区 + */ + WARD("WARD"), + + /** + * 中国 + */ + CHINA("CHINA"), + + /** + * 省份： + */ + PROVINCE("PROVINCE"), + ; + + final private String info; + + NodeTypeEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java index 932a15d0..2a09634a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java @@ -7,6 +7,7 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -65,8 +66,8 @@ public class SpecialDiseaseTriggerConditionController extends BaseController { @PreAuthorize("@ss.hasPermi('system:triggerCondition:add')") @Log(title = "触发条件关系", businessType = BusinessType.INSERT) @PostMapping("/add") - public AjaxResult add(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition)); + public AjaxResult add(@RequestBody TriggerConditionDTO triggerConditionList) { + return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(triggerConditionList)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java new file mode 100644 index 00000000..8aa35ae8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java @@ -0,0 +1,21 @@ +package com.xinelu.manage.dto.specialdiseasetriggercondition; + +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import lombok.Data; + +import java.util.List; + +/** + * 触发条件关系DTO + * + * @author xinelu + * @date 2024-03-18 + */ +@Data +public class TriggerConditionDTO { + + /** + * 触发条件集和 + */ + List triggerConditionList; +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java index 23ee7b42..2bd41168 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java @@ -17,7 +17,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param id 触发条件关系主键 * @return 触发条件关系 */ - public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); /** * 查询触发条件关系列表 @@ -25,7 +25,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 触发条件关系集合 */ - public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 新增触发条件关系 @@ -33,7 +33,15 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 批量新增触发条件关系 + * + * @param triggerConditionList 触发条件关系 + * @return 结果 + */ + int insertTriggerConditionList(List triggerConditionList); /** * 修改触发条件关系 @@ -41,7 +49,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 删除触发条件关系 @@ -49,7 +57,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param id 触发条件关系主键 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionById(Long id); + int deleteSpecialDiseaseTriggerConditionById(Long id); /** * 批量删除触发条件关系 @@ -57,5 +65,5 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 5ab8bac3..a4aeadac 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -49,7 +49,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setCreateTime(DateUtils.getNowDate()); + return signPatientManageRouteNodeMapper.insertSignPatientManageRouteNode(signPatientManageRouteNode); } @@ -61,7 +61,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int updateSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setUpdateTime(DateUtils.getNowDate()); + return signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java index 67bb2be8..5c027868 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.specialdiseasetriggercondition; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import java.util.List; @@ -17,7 +18,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param id 触发条件关系主键 * @return 触发条件关系 */ - public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); /** * 查询触发条件关系列表 @@ -25,15 +26,15 @@ public interface ISpecialDiseaseTriggerConditionService { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 触发条件关系集合 */ - public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 新增触发条件关系 * - * @param specialDiseaseTriggerCondition 触发条件关系 + * @param triggerConditionList 触发条件关系 * @return 结果 */ - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList); /** * 修改触发条件关系 @@ -41,7 +42,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 批量删除触发条件关系 @@ -49,7 +50,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param ids 需要删除的触发条件关系主键集合 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); /** * 删除触发条件关系信息 @@ -57,5 +58,5 @@ public interface ISpecialDiseaseTriggerConditionService { * @param id 触发条件关系主键 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionById(Long id); + int deleteSpecialDiseaseTriggerConditionById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java index 1edc1d97..b6f5f42c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java @@ -1,6 +1,8 @@ package com.xinelu.manage.service.specialdiseasetriggercondition.impl; +import com.xinelu.common.utils.SecurityUtils; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; import org.springframework.stereotype.Service; @@ -46,13 +48,14 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas /** * 新增触发条件关系 * - * @param specialDiseaseTriggerCondition 触发条件关系 + * @param triggerConditionList 触发条件关系 * @return 结果 */ @Override - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - specialDiseaseTriggerCondition.setCreateTime(LocalDateTime.now()); - return specialDiseaseTriggerConditionMapper.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); + public int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList) { + triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateTime(LocalDateTime.now())); + triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateBy(SecurityUtils.getUsername())); + return specialDiseaseTriggerConditionMapper.insertTriggerConditionList(triggerConditionList.getTriggerConditionList()); } /** diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml index dbd1096b..72f89394 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml @@ -132,6 +132,35 @@ + + insert into special_disease_trigger_condition( + route_id, + route_name, + trigger_condition_code, + trigger_condition_name, + trigger_condition_operator, + trigger_condition_value, + trigger_condition_sort, + trigger_condition_remark, + create_by, + create_time + )values + + ( + #{triggerConditionList.routeId}, + #{triggerConditionList.routeName}, + #{triggerConditionList.triggerConditionCode}, + #{triggerConditionList.triggerConditionName}, + #{triggerConditionList.triggerConditionOperator}, + #{triggerConditionList.triggerConditionValue}, + #{triggerConditionList.triggerConditionSort}, + #{triggerConditionList.triggerConditionRemark}, + #{triggerConditionList.createBy}, + #{triggerConditionList.createTime} + ) + + + update special_disease_trigger_condition From b0d447bdd8eb21d368ddc737a0022aedbe67956e Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 20 Mar 2024 08:56:46 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientVisitRecordController.java | 7 +- .../ServicePackageController.java | 37 +- .../domain/patientinfo/PatientInfo.java | 15 +- .../PatientPreHospitalization.java | 8 +- .../PatientVisitInHospital.java | 4 +- .../PatientVisitOperation.java | 4 +- .../PatientVisitRecord.java | 17 +- .../domain/projectbatch/ProjectBatch.java | 7 +- .../projectlastresult/ProjectLastResult.java | 4 +- .../domain/projectresult/ProjectResult.java | 4 +- .../SignPatientManageRouteNode.java | 7 +- .../SignPatientPackage.java | 6 +- .../signpatientrecord/SignPatientRecord.java | 13 +- .../dto/materialsinfo/MaterialsInfoDto.java | 6 +- .../dto/patientinfo/PatientInfoDto.java | 13 +- .../PatientVisitRecordDto.java | 6 +- .../PatientVisitRecordImportDto.java | 11 +- .../PatientVisitRecordSaveDto.java | 53 +- .../dto/projectrecord/ProjectRecordDto.java | 6 +- .../ProjectResultStatisticDto.java | 6 +- .../dto/propagandainfo/PropagandaInfoDto.java | 6 +- .../SignPatientPackageSaveDto.java | 6 +- .../signpatientrecord/SignPatientAddDto.java | 3 + .../signpatientrecord/SignPatientListDto.java | 14 +- .../impl/PatientVisitRecordServiceImpl.java | 47 +- .../IServicePackageService.java | 12 + .../impl/ServicePackageServiceImpl.java | 25 +- .../SignPatientManageRouteServiceImpl.java | 6 +- ...SignPatientManageRouteNodeServiceImpl.java | 6 +- .../impl/SignPatientRecordServiceImpl.java | 10 +- .../SignRouteTriggerConditionServiceImpl.java | 6 +- .../patientblacklist/PatientBlacklistVo.java | 4 +- .../signpatientrecord/SignPatientInfoVo.java | 11 +- .../signpatientrecord/SignPatientListVo.java | 48 +- .../SignPatientRecordVo.java | 4 +- .../PatientVisitRecordMapper.xml | 464 ++++++++++++------ .../SignPatientPackageMapper.xml | 28 +- .../SignPatientRecordMapper.xml | 9 +- .../resources/mapper/system/SysUserMapper.xml | 2 +- 39 files changed, 618 insertions(+), 327 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 35a9076d..3bba4b5b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Objects; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -107,7 +107,7 @@ public class PatientVisitRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping("saveRecord") - public R saveRecord(@Validated @RequestBody PatientVisitRecordSaveDto saveDto) { + public R saveRecord(@Valid @RequestBody PatientVisitRecordSaveDto saveDto) { patientVisitRecordService.saveRecord(saveDto); return R.ok(); } @@ -116,10 +116,11 @@ public class PatientVisitRecordController extends BaseController { /** * 修改患者就诊记录基本信息 */ + @ApiOperation("修改患者就诊记录基本信息") @PreAuthorize("@ss.hasPermi('manage:visit:edit')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PatientVisitRecordSaveDto patientVisitRecord) { + public AjaxResult edit(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java index 75276816..61fa86f0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java @@ -3,6 +3,7 @@ package com.xinelu.manage.controller.servicepackage; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; @@ -12,12 +13,18 @@ import com.xinelu.manage.service.servicepackage.IServicePackageService; import com.xinelu.manage.vo.servicepackage.ServicePackageVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - +import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +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; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 服务包基础信息Controller @@ -35,13 +42,23 @@ public class ServicePackageController extends BaseController { /** * 查询服务包基础信息列表 */ - @ApiOperation("查询服务包基础信息列表") + @ApiOperation("分页查询服务包基础信息列表") @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')") @GetMapping("/list") public TableDataInfo list(ServicePackage servicePackage) { return servicePackageService.selectServicePackageList(servicePackage); } + /** + * 查询服务包基础信息列表 + */ + @ApiOperation("查询服务包基础信息列表") + @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')") + @GetMapping("/getList") + public R> getList(ServicePackage servicePackage) { + return R.ok(servicePackageService.selectList(servicePackage)); + } + /** * 导出服务包基础信息列表 */ @@ -66,6 +83,16 @@ public class ServicePackageController extends BaseController { return AjaxResult.success(servicePackageService.selectServicePackageById(id)); } + /** + * 获取服务包基础信息 + */ + @ApiOperation("获取服务包基础信息") + @PreAuthorize("@ss.hasPermi('manage:servicepackage:query')") + @GetMapping(value = "/getById/{id}") + public R getById(@PathVariable("id") Long id) { + return R.ok(servicePackageService.getById(id)); + } + /** * 新增服务包基础信息 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 163a4b43..484c4823 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -5,9 +5,8 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - +import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,7 +47,7 @@ public class PatientInfo extends BaseEntity { /** 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** 身份证号 */ @ApiModelProperty(value = "身份证号") @@ -164,11 +163,11 @@ public class PatientInfo extends BaseEntity { /** 入院时间，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间") - private Date admissionDate; + private LocalDate admissionDate; /** 出院时间（出院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "出院时间（出院患者）") - private Date dischargeDate; + private LocalDate dischargeDate; /** 病历内容 */ @ApiModelProperty(value = "病历内容") @@ -184,11 +183,11 @@ public class PatientInfo extends BaseEntity { /** 登记日期（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "登记日期（预住院患者），时间格式：yyyy-MM-dd") - private Date registrationDate; + private LocalDate registrationDate; /** 预约时间（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd") - private Date appointmentDate; + private LocalDate appointmentDate; /** 门诊号（门诊患者） */ @ApiModelProperty(value = "门诊号") @@ -198,7 +197,7 @@ public class PatientInfo extends BaseEntity { /** 就诊时间（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间") @Excel(name = "就诊时间", readConverterExp = "门=诊患者") - private Date visitTime; + private LocalDate visitTime; /** 出院方式（出院患者） */ @ApiModelProperty(value = "出院方式") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java index 8315c9d5..556b997e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java @@ -3,7 +3,7 @@ package com.xinelu.manage.domain.patientprehospitalization; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -48,7 +48,7 @@ public class PatientPreHospitalization extends BaseEntity { * 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty("出生日期，格式：yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** * 家属电话 */ @@ -118,12 +118,12 @@ public class PatientPreHospitalization extends BaseEntity { * 登记日期（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty("登记日期（预住院患者），时间格式：yyyy-MM-dd") - private Date registrationDate; + private LocalDate registrationDate; /** * 预约时间（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty("预约时间（预住院患者），时间格式：yyyy-MM-dd") - private Date appointmentDate; + private LocalDate appointmentDate; /** * 开证医生id */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java index 28a3f5d5..c360204b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java @@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -82,7 +82,7 @@ public class PatientVisitInHospital extends BaseEntity { @ApiModelProperty(value = "签名日期，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "签名日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date signatureDate; + private LocalDateTime signatureDate; /** 体格检查 */ @ApiModelProperty(value = "体格检查") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java index 956184e2..628545f9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java @@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,7 +42,7 @@ public class PatientVisitOperation extends BaseEntity { @ApiModelProperty(value = "手术日期，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "手术日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date operationDate; + private LocalDateTime operationDate; /** 手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA */ @ApiModelProperty(value = "手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index a7d2ee8f..6ae74c02 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -5,7 +5,8 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -67,7 +68,7 @@ public class PatientVisitRecord extends BaseEntity { @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** 年龄 */ @ApiModelProperty(value = "年龄") @@ -88,7 +89,7 @@ public class PatientVisitRecord extends BaseEntity { @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date visitDate; + private LocalDateTime visitDate; /** 就诊名称 */ @ApiModelProperty(value = "就诊名称") @@ -162,20 +163,20 @@ public class PatientVisitRecord extends BaseEntity { /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date admissionTime; + private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date dischargeTime; + private LocalDateTime dischargeTime; /** _记录时间（入院记录） */ @ApiModelProperty(value = "_记录时间") @Excel(name = "_记录时间", readConverterExp = "入=院记录") - private Date recordTime; + private LocalDateTime recordTime; /** 门诊记录信息（就诊记录-门诊记录） */ @ApiModelProperty(value = "门诊记录信息") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java index 6ecf5942..474bb080 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java @@ -3,7 +3,8 @@ package com.xinelu.manage.domain.projectbatch; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.Data; /** @@ -38,7 +39,7 @@ public class ProjectBatch extends BaseEntity { * 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty("出生日期，格式：yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** * 身份证号 */ @@ -73,7 +74,7 @@ public class ProjectBatch extends BaseEntity { * 批次创建时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty("批次创建时间，格式：yyyy-MM-dd HH:mm:ss") - private Date batchDate; + private LocalDateTime batchDate; /** * 删除标识，0：否，1：是 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java index 2f3ecfcc..17037dca 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java @@ -5,7 +5,7 @@ import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import lombok.Data; /** @@ -115,7 +115,7 @@ public class ProjectLastResult extends BaseEntity { * 检测时间 */ @ApiModelProperty("检测时间") - private Date measureTime; + private LocalDateTime measureTime; /** * 检测人姓名，自动上传时为空，手动上传为上传人姓名 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java index 73ad82cf..4de8bb58 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java @@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -124,7 +124,7 @@ private static final long serialVersionUID=1L; @ApiModelProperty(value = "检测时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date measureTime; + private LocalDateTime measureTime; /** 检测人姓名，自动上传时为空，手动上传为上传人姓名 */ @ApiModelProperty(value = "检测人姓名，自动上传时为空，手动上传为上传人姓名") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index 4cdea3ed..c10a01cd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -5,7 +5,8 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; +import java.time.LocalTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -72,7 +73,7 @@ public class SignPatientManageRouteNode extends BaseEntity { @ApiModelProperty(value = "执行时间，格式：HH:mm") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd") - private Date executeTime; + private LocalTime executeTime; /** 电话推送标识，0：未开启，1：已开启 */ @ApiModelProperty(value = "电话推送标识，0：未开启，1：已开启") @@ -268,7 +269,7 @@ public class SignPatientManageRouteNode extends BaseEntity { @ApiModelProperty(value = "节点审核时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "节点审核时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date routeCheckDate; + private LocalDateTime routeCheckDate; /** 节点审核备注信息，存储审核备注信息以及审核不通过原因等信息 */ @ApiModelProperty(value = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java index dcc5e289..6e511aff 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java @@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -64,13 +64,13 @@ public class SignPatientPackage extends BaseEntity { @ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date serviceStartTime; + private LocalDateTime serviceStartTime; /** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private Date serviceEndTime; + private LocalDateTime serviceEndTime; /** * 服务包期限 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java index 4f77fa36..cd030ed7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java @@ -4,15 +4,14 @@ 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.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; - /** * 患者签约记录表 * @@ -67,7 +66,7 @@ public class SignPatientRecord extends BaseEntity { */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss @@ -173,7 +172,7 @@ public class SignPatientRecord extends BaseEntity { * 加入意向时间（意向签约） */ @ApiModelProperty(value = "加入意向时间（意向签约）") - private Date intentionalTime; + private LocalDateTime intentionalTime; /** * 开单医生id（意向签约） @@ -191,7 +190,7 @@ public class SignPatientRecord extends BaseEntity { * 提交时间（待续签） */ @ApiModelProperty(value = "提交时间（待续签）") - private Date submissionTime; + private LocalDateTime submissionTime; /** * 金额 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java index aab54f8e..ad9bfcb6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -18,11 +18,11 @@ public class MaterialsInfoDto { @ApiModelProperty(value = "创建时间开始，yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTimeStart; + private LocalDate createTimeStart; @ApiModelProperty(value = "创建时间结束，yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTimeEnd; + private LocalDate createTimeEnd; /** 素材状态，已上架：LISTED，未上架：NOT_LISTED */ @ApiModelProperty(value = "素材状态,已上架：LISTED，未上架：NOT_LISTED") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index 6bb3b936..eceb2c28 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -2,6 +2,7 @@ package com.xinelu.manage.dto.patientinfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; import java.util.Date; import lombok.Data; @@ -64,27 +65,27 @@ public class PatientInfoDto { /** 就诊时间开始（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间开始") - private Date visitTimeStart; + private LocalDate visitTimeStart; /** 就诊时间结束（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间结束") - private Date visitTimeEnd; + private LocalDate visitTimeEnd; /** 入院时间开始，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间开始") - private Date admissionDateStart; + private LocalDate admissionDateStart; /** 入院时间结束，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间结束") - private Date admissionDateEnd; + private LocalDate admissionDateEnd; /** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "预约时间开始（预住院患者），时间格式：yyyy-MM-dd") - private Date appointmentDateStart; + private LocalDate appointmentDateStart; /** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "预约时间结束（预住院患者），时间格式：yyyy-MM-dd") - private Date appointmentDateEnd; + private LocalDate appointmentDateEnd; /** 预约治疗组（取值以及枚举未知？） */ @ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index 94761bff..f1574740 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -2,7 +2,7 @@ package com.xinelu.manage.dto.patientvisitrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -28,9 +28,9 @@ public class PatientVisitRecordDto { @ApiModelProperty(value = "就诊时间开始") @JsonFormat(pattern = "yyyy-MM-dd") - private Date visitDateStart; + private LocalDate visitDateStart; @ApiModelProperty(value = "就诊时间结束") @JsonFormat(pattern = "yyyy-MM-dd") - private Date visitDateEnd; + private LocalDate visitDateEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java index 70ecb3cf..2a7d57c5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -35,7 +35,12 @@ public class PatientVisitRecordImportDto { /** 入院时间，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间") @Excel(name = "入院时间") - private Date admissionDate; + private LocalDate admissionDate; + + /** 出院时间 */ + @ApiModelProperty(value = "出院时间") + @Excel(name = "出院时间") + private LocalDate dischargeTime; /** 身份证号 */ @ApiModelProperty(value = "身份证号") @@ -46,7 +51,7 @@ public class PatientVisitRecordImportDto { @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "出生日期") - private Date birthDate; + private LocalDate birthDate; /** 性别，男：MALE，女：FEMALE */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index 5f8a47f2..72caad52 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import javax.validation.constraints.NotBlank; +import java.time.LocalDateTime; +import javax.validation.constraints.NotNull; import lombok.Data; /** @@ -17,31 +17,35 @@ import lombok.Data; @Data public class PatientVisitRecordSaveDto { + /** 就诊信息表id */ + @ApiModelProperty(value = "就诊信息表id") + private Long id; + /** 患者表id */ @ApiModelProperty(value = "患者表id") - @NotBlank(message = "患者数据不能为空") + @NotNull(message = "患者数据不能为空") private Long patientId; /** * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - @NotBlank(message = "就诊类型不能为空") + @NotNull(message = "就诊类型不能为空") private String visitType; /** 主要诊断 */ @ApiModelProperty(value = "主要诊断") - @NotBlank(message = "主要诊断不能为空") + @NotNull(message = "主要诊断不能为空") private String mainDiagnosis; /** 就诊流水号 */ @ApiModelProperty(value = "就诊流水号") - @NotBlank(message = "就诊流水号不能为空") + @NotNull(message = "就诊流水号不能为空") private String visitSerialNumber; /** 主治医生id */ @ApiModelProperty(value = "主治医生id") - @NotBlank(message = "主治医生不能为空") + @NotNull(message = "主治医生不能为空") private Long attendingPhysicianId; /** 主治医生姓名 */ @@ -69,7 +73,7 @@ public class PatientVisitRecordSaveDto { private String campusAgencyName; /** 所属科室id */ - @NotBlank(message = "科室不能为空") + @NotNull(message = "科室不能为空") @ApiModelProperty(value = "所属科室id") private Long departmentId; @@ -77,34 +81,43 @@ public class PatientVisitRecordSaveDto { @ApiModelProperty(value = "所属科室名称") private String departmentName; + /** 所属病区id */ + @ApiModelProperty(value = "所属病区id") + @Excel(name = "所属病区id") + private Long wardId; + + /** 所属病区名称 */ + @ApiModelProperty(value = "所属病区名称") + @Excel(name = "所属病区名称") + private String wardName; + /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @NotBlank(message = "入院时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date admissionTime; + @NotNull(message = "入院时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @NotBlank(message = "出院时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date dischargeTime; + @NotNull(message = "出院时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dischargeTime; @ApiModelProperty(value = "住院/门诊号") private String inHospitalNumber; /** 入院病历信息，存储患者入院的整个病历信息 */ @ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息") - @NotBlank(message = "入院病历不能为空") + @NotNull(message = "入院病历不能为空") private String inHospitalInfo; /** 出院病历信息，存储患者出院的整个病历信息 */ @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") - @NotBlank(message = "出院病历不能为空") private String outHospitalInfo; - /** 门诊记录信息（就诊记录-门诊记录） */ - @ApiModelProperty(value = "门诊记录信息") - @NotBlank(message = "门诊记录信息不能为空") - private String outpatientVisitInfo; + /** 手术名称 */ + @ApiModelProperty(value = "手术名称") + @Excel(name = "手术名称") + private String surgicalName; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java index 93a12824..40e5de67 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java @@ -2,7 +2,7 @@ package com.xinelu.manage.dto.projectrecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -30,11 +30,11 @@ public class ProjectRecordDto { * 检测时间 */ @ApiModelProperty("检测时间开始") - private Date measureTimeStart; + private LocalDate measureTimeStart; /** * 检测时间 */ @ApiModelProperty("检测时间结束") - private Date measureTimeEnd; + private LocalDate measureTimeEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java index 46d22553..975a34d3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java @@ -3,7 +3,7 @@ package com.xinelu.manage.dto.projectresult; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -46,13 +46,13 @@ public class ProjectResultStatisticDto { */ @ApiModelProperty("检测时间开始") @JsonFormat(pattern = "yyyy-MM-dd") - private Date measureTimeStart; + private LocalDate measureTimeStart; /** * 检测时间结束 */ @ApiModelProperty("检测时间结束") @JsonFormat(pattern = "yyyy-MM-dd") - private Date measureTimeEnd; + private LocalDate measureTimeEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java index 187cd252..6fc1b862 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -56,12 +56,12 @@ public class PropagandaInfoDto { */ @ApiModelProperty(value = "创建时间开始") @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTimeStart; + private LocalDate createTimeStart; /** * 创建时间 */ @ApiModelProperty(value = "创建时间结束") @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTimeEnd; + private LocalDate createTimeEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java index d4461869..601d84c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; import javax.validation.constraints.NotNull; import lombok.Data; @@ -39,13 +39,13 @@ public class SignPatientPackageSaveDto { @ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "服务开始时间不能为空！") - private Date serviceStartTime; + private LocalDate serviceStartTime; /** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "服务结束时间不能为空！") - private Date serviceEndTime; + private LocalDate serviceEndTime; /** * 服务包周期 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java index 96a2d062..8c3e27ad 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java @@ -34,6 +34,9 @@ public class SignPatientAddDto { @NotNull(message = "请选择管理路径") private Long routeId; + @ApiModelProperty("管理路径名称") + private String routeName; + private List devices; private List informeds; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java index 9932bf1c..55f710af 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java @@ -3,7 +3,7 @@ package com.xinelu.manage.dto.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.Data; /** @@ -42,13 +42,13 @@ public class SignPatientListDto { * 加入意向时间（意向签约） */ @ApiModelProperty(value = "加入意向时间开始（意向签约）") - private Date intentionalTimeStart; + private LocalDate intentionalTimeStart; /** * 加入意向时间（意向签约） */ @ApiModelProperty(value = "加入意向时间结束（意向签约）") - private Date intentionalTimeEnd; + private LocalDate intentionalTimeEnd; /** * 意向来源（意向签约，字典枚举） @@ -60,10 +60,10 @@ public class SignPatientListDto { * 签约时间，格式：yyyy-MM-dd */ @ApiModelProperty(value = "签约时间开始，格式：yyyy-MM-dd") - private Date signTimeStart; + private LocalDate signTimeStart; @ApiModelProperty(value = "签约时间结束，格式：yyyy-MM-dd") - private Date signTimeEnd; + private LocalDate signTimeEnd; /** * 签约时所属医院id */ @@ -102,10 +102,10 @@ public class SignPatientListDto { @ApiModelProperty(value = "服务结束时间开始") @JsonFormat(pattern = "yyyy-MM-dd") - private Date serviceEndTimeStart; + private LocalDate serviceEndTimeStart; @ApiModelProperty(value = "服务结束时间结束") @JsonFormat(pattern = "yyyy-MM-dd") - private Date serviceEndTimeEnd; + private LocalDate serviceEndTimeEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 9f538fb8..ddc7c21f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -22,9 +22,7 @@ import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; @@ -99,12 +97,22 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); // 住院时间，出院时间-入院时间 - LocalDate admissionTime = saveDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - LocalDate dischargeTime = saveDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime); + long daysBetween = ChronoUnit.DAYS.between(saveDto.getAdmissionTime(), saveDto.getDischargeTime()); patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); - return 0; + if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, saveDto.getVisitType())) { + patientVisitRecord.setVisitDate(saveDto.getDischargeTime()); + } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, saveDto.getVisitType())) { + patientVisitRecord.setVisitDate(saveDto.getAdmissionTime()); + } + int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); + if (flag > 0) { + // 修改患者信息 + patientInfo.setVisitMethod(saveDto.getVisitType()); + patientInfo.setDepartmentId(saveDto.getDepartmentId()); + patientInfo.setDepartmentName(saveDto.getDepartmentName()); + patientMapper.updatePatientInfo(patientInfo); + } + return flag; } /** @@ -115,17 +123,32 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService */ @Override public int updatePatientVisitRecord(PatientVisitRecordSaveDto updDto) { + if (updDto.getId() == null) { + throw new ServiceException("数据传输错误"); + } PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); BeanUtils.copyBeanProp(patientVisitRecord, updDto); patientVisitRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setUpdateTime(LocalDateTime.now()); // 住院时间，出院时间-入院时间 - LocalDate admissionTime = updDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - LocalDate dischargeTime = updDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime); + long daysBetween = ChronoUnit.DAYS.between(updDto.getAdmissionTime(), updDto.getDischargeTime()); patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); - return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); + if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, updDto.getVisitType())) { + patientVisitRecord.setVisitDate(updDto.getDischargeTime()); + } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, updDto.getVisitType())) { + patientVisitRecord.setVisitDate(updDto.getAdmissionTime()); + } + int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); + if (flag > 0) { + // 查询患者信息 + PatientInfo patientInfo = patientMapper.selectPatientInfoById(updDto.getPatientId()); + // 修改患者信息 + patientInfo.setVisitMethod(updDto.getVisitType()); + patientInfo.setDepartmentId(updDto.getDepartmentId()); + patientInfo.setDepartmentName(updDto.getDepartmentName()); + patientMapper.updatePatientInfo(patientInfo); + } + return flag; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java index 213efea9..678d8b55 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java @@ -4,6 +4,8 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.servicepackage.ServicePackage; import com.xinelu.manage.dto.servicepackage.ServicePackageAddDTO; import com.xinelu.manage.vo.servicepackage.ServicePackageDetailVO; +import com.xinelu.manage.vo.servicepackage.ServicePackageVO; +import java.util.List; /** * 服务包基础信息Service接口 @@ -20,6 +22,8 @@ public interface IServicePackageService { */ public ServicePackageDetailVO selectServicePackageById(Long id); + ServicePackageVO getById(Long id); + /** * 查询服务包基础信息列表 * @@ -28,6 +32,14 @@ public interface IServicePackageService { */ public TableDataInfo selectServicePackageList(ServicePackage servicePackage); + /** + * 查询服务包基础信息列表 + * + * @param servicePackage 服务包基础信息 + * @return 服务包基础信息集合 + */ + List selectList(ServicePackage servicePackage); + /** * 新增服务包基础信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java index 7351963e..060d893f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java @@ -16,6 +16,7 @@ import com.xinelu.manage.service.servicepackage.IServicePackageService; import com.xinelu.manage.vo.servicepackage.ServicePackageDetailVO; import com.xinelu.manage.vo.servicepackage.ServicePackageVO; import com.xinelu.manage.vo.servicepackagecontent.ServicePackageContentVO; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,7 +61,23 @@ public class ServicePackageServiceImpl implements IServicePackageService { return servicePackageDetailVO; } - /** + /** + * 查询服务包基础信息 + * + * @param id 服务包基础信息主键 + * @return 服务包基础信息 + */ + @Override public ServicePackageVO getById(Long id) { + ServicePackageDetailVO servicePackageDetailVo = servicePackageMapper.selectServicePackagesById(id); + if (ObjectUtils.isEmpty(servicePackageDetailVo)) { + throw new ServiceException("数据传输错误"); + } + ServicePackageVO servicePackageVO = new ServicePackageVO(); + BeanUtils.copyBeanProp(servicePackageVO, servicePackageDetailVo); + return servicePackageVO; + } + + /** * 查询服务包基础信息列表 * * @param servicePackage 服务包基础信息 @@ -78,7 +95,11 @@ public class ServicePackageServiceImpl implements IServicePackageService { return pageServiceUtil.getDataTable(voList); } - /** + @Override public List selectList(ServicePackage servicePackage) { + return servicePackageMapper.selectServicePackageLists(servicePackage); + } + + /** * 新增服务包基础信息 * * @param servicePackageAddDTO 服务包基础信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index efcfb4f3..b0f6cf75 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -1,9 +1,9 @@ package com.xinelu.manage.service.signpatientmanageroute.impl; -import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper; import com.xinelu.manage.service.signpatientmanageroute.ISignPatientManageRouteService; +import java.time.LocalDateTime; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; @@ -49,7 +49,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout */ @Override public int insertSignPatientManageRoute(SignPatientManageRoute signPatientManageRoute) { - signPatientManageRoute.setCreateTime(DateUtils.getNowDate()); + signPatientManageRoute.setCreateTime(LocalDateTime.now()); return signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute); } @@ -61,7 +61,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout */ @Override public int updateSignPatientManageRoute(SignPatientManageRoute signPatientManageRoute) { - signPatientManageRoute.setUpdateTime(DateUtils.getNowDate()); + signPatientManageRoute.setUpdateTime(LocalDateTime.now()); return signPatientManageRouteMapper.updateSignPatientManageRoute(signPatientManageRoute); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 5ab8bac3..b3afe663 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -1,9 +1,9 @@ package com.xinelu.manage.service.signpatientmanageroutenode.impl; -import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; +import java.time.LocalDateTime; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; @@ -49,7 +49,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setCreateTime(DateUtils.getNowDate()); + signPatientManageRouteNode.setCreateTime(LocalDateTime.now()); return signPatientManageRouteNodeMapper.insertSignPatientManageRouteNode(signPatientManageRouteNode); } @@ -61,7 +61,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int updateSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setUpdateTime(DateUtils.getNowDate()); + signPatientManageRouteNode.setUpdateTime(LocalDateTime.now()); return signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index aa0a921b..cbbb3c35 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.xinelu.manage.service.signpatientrecord.impl; -import com.xinelu.common.constant.PaymentStatusConstants; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.constant.TaskCreateTypeConstant; import com.xinelu.common.exception.ServiceException; @@ -8,7 +7,6 @@ import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.patientinfo.PatientInfo; -import com.xinelu.manage.domain.servicepackage.ServicePackage; import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; @@ -120,7 +118,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { } signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER); signPatientRecord.setDelFlag(0); - signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES); + signPatientRecord.setPaymentStatus(signPatientPackageDto.getPackagePaymentStatus()); signPatientRecord.setSignTime(LocalDateTime.now()); signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); signPatientRecord.setPrice(signPatientPackageDto.getPackagePrice()); @@ -137,18 +135,16 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { patientInfoMapper.updatePatientInfo(patient); if (flag > 0) { // 保存签约服务包信息 - ServicePackage servicePackage = servicePackageMapper.selectServicePackageById(signPatientPackageDto.getServicePackageId()); SignPatientPackage signPatientPackage = new SignPatientPackage(); - BeanUtils.copyBeanProp(signPatientPackage, servicePackage); // 服务开始时间、服务结束时间 BeanUtils.copyBeanProp(signPatientPackage, signPatientPackageDto); signPatientPackage.setSignPatientRecordId(signPatientRecord.getId()); signPatientPackage.setPatientId(signPatientRecord.getPatientId()); - signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES); + signPatientPackage.setServiceStartTime(signPatientPackageDto.getServiceStartTime().atStartOfDay()); + signPatientPackage.setServiceEndTime(signPatientPackageDto.getServiceEndTime().atTime(23,59,59)); signPatientPackage.setCreateTime(LocalDateTime.now()); signPatientPackage.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - signPatientPackage.setId(null); signPatientPackageMapper.insertSignPatientPackage(signPatientPackage); // 保存管理路径 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signroutetriggercondition/impl/SignRouteTriggerConditionServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signroutetriggercondition/impl/SignRouteTriggerConditionServiceImpl.java index 189aa5a0..237ce5a0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signroutetriggercondition/impl/SignRouteTriggerConditionServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signroutetriggercondition/impl/SignRouteTriggerConditionServiceImpl.java @@ -1,9 +1,9 @@ package com.xinelu.manage.service.signroutetriggercondition.impl; -import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.signroutetriggercondition.SignRouteTriggerCondition; import com.xinelu.manage.mapper.signroutetriggercondition.SignRouteTriggerConditionMapper; import com.xinelu.manage.service.signroutetriggercondition.ISignRouteTriggerConditionService; +import java.time.LocalDateTime; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; @@ -49,7 +49,7 @@ public class SignRouteTriggerConditionServiceImpl implements ISignRouteTriggerCo */ @Override public int insertSignRouteTriggerCondition(SignRouteTriggerCondition signRouteTriggerCondition) { - signRouteTriggerCondition.setCreateTime(DateUtils.getNowDate()); + signRouteTriggerCondition.setCreateTime(LocalDateTime.now()); return signRouteTriggerConditionMapper.insertSignRouteTriggerCondition(signRouteTriggerCondition); } @@ -61,7 +61,7 @@ public class SignRouteTriggerConditionServiceImpl implements ISignRouteTriggerCo */ @Override public int updateSignRouteTriggerCondition(SignRouteTriggerCondition signRouteTriggerCondition) { - signRouteTriggerCondition.setUpdateTime(DateUtils.getNowDate()); + signRouteTriggerCondition.setUpdateTime(LocalDateTime.now()); return signRouteTriggerConditionMapper.updateSignRouteTriggerCondition(signRouteTriggerCondition); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java index 758c1d31..9fb04d51 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java @@ -3,7 +3,7 @@ package com.xinelu.manage.vo.patientblacklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; import lombok.Data; /** @@ -86,5 +86,5 @@ public class PatientBlacklistVo { * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private LocalDateTime createTime; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java index 713853b7..dfd96af0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java @@ -7,7 +7,8 @@ import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHar import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import lombok.Data; @@ -54,14 +55,14 @@ public class SignPatientInfoVo { /** 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date signTime; + private LocalDateTime signTime; /** * 签约时所属医院名称 @@ -162,12 +163,12 @@ public class SignPatientInfoVo { /** 服务开始时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") - private Date serviceStartTime; + private LocalDateTime serviceStartTime; /** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") - private Date serviceEndTime; + private LocalDateTime serviceEndTime; /** * 服务包期限 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java index 97e153df..4af2c2cd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java @@ -1,10 +1,12 @@ package com.xinelu.manage.vo.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.Data; /** @@ -51,14 +53,20 @@ public class SignPatientListVo { /** 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthDate; + private LocalDate birthDate; /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date signTime; + private LocalDateTime signTime; + + /** + * 签约时所属医院id + */ + @ApiModelProperty(value = "签约时所属医院id") + private Long hospitalAgencyId; /** * 签约时所属医院名称 @@ -66,18 +74,36 @@ public class SignPatientListVo { @ApiModelProperty(value = "签约时所属医院名称") private String hospitalAgencyName; + /** + * 签约时所属院区id + */ + @ApiModelProperty(value = "签约时所属院区id") + private Long campusAgencyId; + /** * 签约时所属院区名称 */ @ApiModelProperty(value = "签约时所属院区名称") private String campusAgencyName; + /** + * 签约时所属科室id + */ + @ApiModelProperty(value = "签约时所属科室id") + private Long departmentId; + /** * 签约时所属科室名称 */ @ApiModelProperty(value = "签约时所属科室名称") private String departmentName; + /** + * 签约时所属病区id + */ + @ApiModelProperty(value = "签约时所属病区id") + private Long wardId; + /** * 签约时所属病区名称 */ @@ -134,7 +160,7 @@ public class SignPatientListVo { */ @ApiModelProperty(value = "加入意向时间（意向签约）") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date intentionalTime; + private LocalDateTime intentionalTime; /** * 开单医生姓名（意向签约） @@ -154,11 +180,19 @@ public class SignPatientListVo { @ApiModelProperty(value = "缴费状态，已缴费：PAID，未交费：UNPAID_FEES") private String paymentStatus; + /** 服务包表id */ + @ApiModelProperty(value = "服务包表id") + @Excel(name = "服务包表id") + private Long servicePackageId; + /** 服务包名称 */ @ApiModelProperty(value = "服务包名称") private String packageName; - /** 服务周期，单位是月 */ - @ApiModelProperty(value = "服务周期，单位是月") - private Integer serviceCycle; + /** 服务周期 */ + @ApiModelProperty(value = "服务周期") + private Integer packageTerm; + + @ApiModelProperty(value = "服务周期单位") + private String packageTermUnit; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java index a2369e95..e0b2b19e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java @@ -3,7 +3,7 @@ package com.xinelu.manage.vo.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDateTime; import lombok.Data; /** @@ -35,7 +35,7 @@ public class SignPatientRecordVo { @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date signTime; + private LocalDateTime signTime; /** * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index d6e9a44b..e54f2fe3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -72,6 +72,7 @@ and visit_date <= #{visitDateEnd} + order by visit_date desc @@ -52,8 +54,11 @@ and service_end_time = #{serviceEndTime} - - and service_cycle = #{serviceCycle} + + and package_term = #{packageTerm} + + + and package_term_unit = #{packageTermUnit} @@ -84,8 +89,10 @@ service_end_time, - service_cycle, + package_term, + package_term_unit, + create_by, create_time, @@ -113,8 +120,10 @@ #{serviceEndTime}, - #{serviceCycle}, + #{packageTerm}, + #{packageTermUnit}, + #{createBy}, #{createTime}, @@ -153,9 +162,12 @@ service_end_time = #{serviceEndTime}, - service_cycle = - #{serviceCycle}, + package_term = + #{packageTerm}, + package_term_unit = + #{packageTermUnit}, + create_by = #{createBy}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index f3b7536d..27dcd27a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -329,12 +329,13 @@ sign.id,sign.patient_id,sign.patient_name, sign.patient_phone,sign.card_no,sign.sex,sign.birth_date, sign.sign_time, sign.hospital_agency_id,sign.hospital_agency_name, - sign.campus_agency_name,sign.department_name, - sign.ward_name,sign.visit_serial_number, - sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, + sign.campus_agency_id, sign.campus_agency_name, + sign.department_id, sign.department_name, + sign.ward_id,sign.ward_name, + sign.visit_serial_number,sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, sign.service_status,sign.sign_status,sign.intentional_source, sign.intentional_time,sign.billing_doctor_name,sign.payment_status,sign.price, - p.package_name, p.service_end_time, p.service_cycle + p.service_package_id, p.package_name, p.service_end_time, p.package_term, p.package_term_unit from patient_info patient left join sign_patient_record sign on patient.sign_patient_record_id = sign.id left join sign_patient_package p on sign.id = p.sign_patient_record_id diff --git a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml index 248338df..c464c162 100644 --- a/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -120,7 +120,7 @@ AND u.phonenumber like concat('%', #{phonenumber}, '%') - and u.post_name = #{userBirthDate} + and u.post_name = #{postName} AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') From 5948851506c4643159f0b7864efa396f237a8b29 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 20 Mar 2024 16:11:51 +0800 Subject: [PATCH 13/32] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xinelu/common/constant/Constants.java | 9 +++++++-- .../labelfieldinfo/LabelFieldInfoController.java | 8 ++++++++ .../SignRouteTriggerCondition.java | 2 -- .../ILabelFieldContentService.java | 12 ++++++------ .../labelfieldinfo/ILabelFieldInfoService.java | 13 ++++++------- .../taskstatusdict/ITaskStatusDictService.java | 12 ++++++------ .../impl/TaskStatusDictServiceImpl.java | 8 ++++++++ 7 files changed, 41 insertions(+), 23 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index b56cc41f..7e48add1 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -180,15 +180,20 @@ public class Constants { public static final String SERVICE_MODE_ENCODING = "SME"; /** - * 服务方式编码 + * 任务类型编码 */ public static final String TASK_TYPE_CODE = "TTC"; /** - * 服务方式编码 + * 任务细分编码 */ public static final String TASK_PARTITION_CODE = "TPC"; + /** + * 任务状态编码 + */ + public static final String TASK_STATUS_CODE = "TSC"; + /** * 门诊患者 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java index 185f35cf..2effbdce 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java @@ -43,6 +43,14 @@ public class LabelFieldInfoController extends BaseController { return getDataTable(list); } + /** + * 查询标签字段信息列表 不分页 + */ + @GetMapping("/labelFieldInfoList") + public AjaxResult labelFieldInfoList(LabelFieldInfo labelFieldInfo) { + return AjaxResult.success(labelFieldInfoService.selectLabelFieldInfoList(labelFieldInfo)); + } + /** * 导出标签字段信息列表 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java index 78acf909..fa449bde 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java @@ -66,6 +66,4 @@ public class SignRouteTriggerCondition extends BaseEntity { @ApiModelProperty(value = "备注信息") @Excel(name = "备注信息") private String triggerConditionRemark; - - } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java index 69a8e5bf..bfbda552 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java @@ -18,7 +18,7 @@ public interface ILabelFieldContentService { * @param id 标签字段内容信息主键 * @return 标签字段内容信息 */ - public LabelFieldContent selectLabelFieldContentById(Long id); + LabelFieldContent selectLabelFieldContentById(Long id); /** * 查询标签字段内容信息列表 @@ -26,7 +26,7 @@ public interface ILabelFieldContentService { * @param labelFieldContent 标签字段内容信息 * @return 标签字段内容信息集合 */ - public List selectLabelFieldContentList(LabelFieldContent labelFieldContent); + List selectLabelFieldContentList(LabelFieldContent labelFieldContent); /** * 新增标签字段内容信息 @@ -34,7 +34,7 @@ public interface ILabelFieldContentService { * @param labelFieldContent 标签字段内容信息 * @return 结果 */ - public int insertLabelFieldContent(LabelFieldContent labelFieldContent); + int insertLabelFieldContent(LabelFieldContent labelFieldContent); /** * 修改标签字段内容信息 @@ -42,7 +42,7 @@ public interface ILabelFieldContentService { * @param labelFieldContent 标签字段内容信息 * @return 结果 */ - public int updateLabelFieldContent(LabelFieldContent labelFieldContent); + int updateLabelFieldContent(LabelFieldContent labelFieldContent); /** * 批量删除标签字段内容信息 @@ -50,7 +50,7 @@ public interface ILabelFieldContentService { * @param ids 需要删除的标签字段内容信息主键集合 * @return 结果 */ - public int deleteLabelFieldContentByIds(Long[] ids); + int deleteLabelFieldContentByIds(Long[] ids); /** * 删除标签字段内容信息 @@ -58,7 +58,7 @@ public interface ILabelFieldContentService { * @param id 标签字段内容信息主键 * @return 结果 */ - public int deleteLabelFieldContentById(Long id); + int deleteLabelFieldContentById(Long id); /** * 批量新增标签字段内容信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java index 2c7dbf5b..b8f060c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java @@ -18,7 +18,7 @@ public interface ILabelFieldInfoService { * @param id 标签字段信息主键 * @return 标签字段信息 */ - public LabelFieldInfo selectLabelFieldInfoById(Long id); + LabelFieldInfo selectLabelFieldInfoById(Long id); /** * 查询标签字段信息列表 @@ -26,7 +26,7 @@ public interface ILabelFieldInfoService { * @param labelFieldInfo 标签字段信息 * @return 标签字段信息集合 */ - public List selectLabelFieldInfoList(LabelFieldInfo labelFieldInfo); + List selectLabelFieldInfoList(LabelFieldInfo labelFieldInfo); /** * 新增标签字段信息 @@ -34,7 +34,7 @@ public interface ILabelFieldInfoService { * @param labelFieldInfo 标签字段信息 * @return 结果 */ - public int insertLabelFieldInfo(LabelFieldInfo labelFieldInfo); + int insertLabelFieldInfo(LabelFieldInfo labelFieldInfo); /** * 修改标签字段信息 @@ -42,7 +42,7 @@ public interface ILabelFieldInfoService { * @param labelFieldInfo 标签字段信息 * @return 结果 */ - public int updateLabelFieldInfo(LabelFieldInfo labelFieldInfo); + int updateLabelFieldInfo(LabelFieldInfo labelFieldInfo); /** * 批量删除标签字段信息 @@ -50,7 +50,7 @@ public interface ILabelFieldInfoService { * @param ids 需要删除的标签字段信息主键集合 * @return 结果 */ - public int deleteLabelFieldInfoByIds(Long[] ids); + int deleteLabelFieldInfoByIds(Long[] ids); /** * 删除标签字段信息信息 @@ -58,11 +58,10 @@ public interface ILabelFieldInfoService { * @param id 标签字段信息主键 * @return 结果 */ - public int deleteLabelFieldInfoById(Long id); + int deleteLabelFieldInfoById(Long id); /** * 批量新增标签字段信息 */ int insertLabelFieldInfoList(LabelFieldInfoAddDTO labelFieldInfoAddDTO); - } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/ITaskStatusDictService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/ITaskStatusDictService.java index 0cd712c9..3248d8fa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/ITaskStatusDictService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/ITaskStatusDictService.java @@ -18,7 +18,7 @@ public interface ITaskStatusDictService { * @param id 任务状态字典主键 * @return 任务状态字典 */ - public TaskStatusDict selectTaskStatusDictById(Long id); + TaskStatusDict selectTaskStatusDictById(Long id); /** * 查询任务状态字典列表 @@ -26,7 +26,7 @@ public interface ITaskStatusDictService { * @param taskStatusDict 任务状态字典 * @return 任务状态字典集合 */ - public List selectTaskStatusDictList(TaskStatusDict taskStatusDict); + List selectTaskStatusDictList(TaskStatusDict taskStatusDict); /** * 新增任务状态字典 @@ -34,7 +34,7 @@ public interface ITaskStatusDictService { * @param taskStatusDict 任务状态字典 * @return 结果 */ - public int insertTaskStatusDict(TaskStatusDict taskStatusDict); + int insertTaskStatusDict(TaskStatusDict taskStatusDict); /** * 修改任务状态字典 @@ -42,7 +42,7 @@ public interface ITaskStatusDictService { * @param taskStatusDict 任务状态字典 * @return 结果 */ - public int updateTaskStatusDict(TaskStatusDict taskStatusDict); + int updateTaskStatusDict(TaskStatusDict taskStatusDict); /** * 批量删除任务状态字典 @@ -50,7 +50,7 @@ public interface ITaskStatusDictService { * @param ids 需要删除的任务状态字典主键集合 * @return 结果 */ - public int deleteTaskStatusDictByIds(Long[] ids); + int deleteTaskStatusDictByIds(Long[] ids); /** * 删除任务状态字典信息 @@ -58,5 +58,5 @@ public interface ITaskStatusDictService { * @param id 任务状态字典主键 * @return 结果 */ - public int deleteTaskStatusDictById(Long id); + int deleteTaskStatusDictById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/impl/TaskStatusDictServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/impl/TaskStatusDictServiceImpl.java index 90acbc96..a5345f79 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/impl/TaskStatusDictServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/taskstatusdict/impl/TaskStatusDictServiceImpl.java @@ -1,5 +1,8 @@ package com.xinelu.manage.service.taskstatusdict.impl; +import com.xinelu.common.constant.Constants; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; import com.xinelu.manage.domain.taskstatusdict.TaskStatusDict; import com.xinelu.manage.mapper.taskstatusdict.TaskStatusDictMapper; import com.xinelu.manage.service.taskstatusdict.ITaskStatusDictService; @@ -20,6 +23,8 @@ import java.util.List; public class TaskStatusDictServiceImpl implements ITaskStatusDictService { @Resource private TaskStatusDictMapper taskStatusDictMapper; + @Resource + private GenerateSystemCodeUtil generateSystemCodeUtil; /** * 查询任务状态字典 @@ -51,7 +56,9 @@ public class TaskStatusDictServiceImpl implements ITaskStatusDictService { */ @Override public int insertTaskStatusDict(TaskStatusDict taskStatusDict) { + taskStatusDict.setTaskStatusCode(Constants.TASK_STATUS_CODE + generateSystemCodeUtil.generateSystemCode(Constants.TASK_STATUS_CODE)); taskStatusDict.setCreateTime(LocalDateTime.now()); + taskStatusDict.setCreateBy(SecurityUtils.getUsername()); return taskStatusDictMapper.insertTaskStatusDict(taskStatusDict); } @@ -64,6 +71,7 @@ public class TaskStatusDictServiceImpl implements ITaskStatusDictService { @Override public int updateTaskStatusDict(TaskStatusDict taskStatusDict) { taskStatusDict.setUpdateTime(LocalDateTime.now()); + taskStatusDict.setUpdateBy(SecurityUtils.getUsername()); return taskStatusDictMapper.updateTaskStatusDict(taskStatusDict); } From 32ca0521f9f049779f32ea8638adf8c0928463fd Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 20 Mar 2024 16:33:12 +0800 Subject: [PATCH 14/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nstants.java => VisitMethodConstants.java} | 2 +- .../patientinfo/PatientInfoController.java | 2 ++ .../SignPatientRecordController.java | 3 ++- .../domain/patientinfo/PatientInfo.java | 13 ++++------ .../PatientVisitRecord.java | 2 +- .../PatientVisitRecordDto.java | 8 +++---- .../PatientVisitRecordSaveDto.java | 2 +- .../impl/PatientVisitRecordServiceImpl.java | 20 ++++++++-------- .../impl/SignPatientRecordServiceImpl.java | 22 ++++++++++++----- .../signpatientrecord/SignPatientInfoVo.java | 24 +++++++++++++++++++ .../manage/patientinfo/PatientInfoMapper.xml | 23 ++++++------------ .../PatientVisitRecordMapper.xml | 16 ++++++------- .../SignPatientRecordMapper.xml | 9 +++---- 13 files changed, 85 insertions(+), 61 deletions(-) rename postdischarge-common/src/main/java/com/xinelu/common/constant/{VisitTypeConstants.java => VisitMethodConstants.java} (89%) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitTypeConstants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java similarity index 89% rename from postdischarge-common/src/main/java/com/xinelu/common/constant/VisitTypeConstants.java rename to postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java index f60b8d78..63455307 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitTypeConstants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java @@ -5,7 +5,7 @@ package com.xinelu.common.constant; * @author: haown * @create: 2024-03-07 15:45 **/ -public class VisitTypeConstants { +public class VisitMethodConstants { /** * 门诊 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 20572c49..73802e37 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -10,6 +10,7 @@ import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -39,6 +40,7 @@ public class PatientInfoController extends BaseController { /** * 查询患者信息列表 */ + @ApiOperation("患者档案列表") @PreAuthorize("@ss.hasPermi('manage:patientInfo:list')") @GetMapping("/list") public TableDataInfo list(PatientInfoDto patientInfo) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java index 2d15c929..fbdb30fc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; +import javax.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -53,7 +54,7 @@ public class SignPatientRecordController extends BaseController { @ApiOperation("签约/续约") @PreAuthorize("@ss.hasPermi('manage:signRecord:add')") @PostMapping("/sign") - public R sign(@RequestBody SignPatientAddDto body) { + public R sign(@Valid @RequestBody SignPatientAddDto body) { int flag = signPatientRecordService.add(body); return flag > 0 ? R.ok() : R.fail(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 484c4823..fafc73cf 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -144,11 +144,6 @@ public class PatientInfo extends BaseEntity { @Excel(name = "所属病区名称") private String wardName; - /** 住院号 */ - @ApiModelProperty(value = "住院号") - @Excel(name = "住院号") - private String admissionNumber; - /** 责任护士 */ @ApiModelProperty(value = "责任护士") private String responsibleNurse; @@ -189,10 +184,10 @@ public class PatientInfo extends BaseEntity { @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd") private LocalDate appointmentDate; - /** 门诊号（门诊患者） */ - @ApiModelProperty(value = "门诊号") - @Excel(name = "门诊号", readConverterExp = "门=诊患者") - private String outpatientNumber; + /** 门诊/住院号 */ + @ApiModelProperty(value = "门诊/住院号 ") + @Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ") + private String inHospitalNumber; /** 就诊时间（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 6ae74c02..17ca9406 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -83,7 +83,7 @@ public class PatientVisitRecord extends BaseEntity { /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - private String visitType; + private String visitMethod; /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index f1574740..f0db4e62 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -1,9 +1,9 @@ package com.xinelu.manage.dto.patientvisitrecord; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @description: 患者就诊记录查询传输对象 @@ -21,16 +21,16 @@ public class PatientVisitRecordDto { * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - private String visitType; + private String visitMethod; @ApiModelProperty(value = "住院/门诊号") private String inHospitalNumber; @ApiModelProperty(value = "就诊时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate visitDateStart; @ApiModelProperty(value = "就诊时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate visitDateEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index 72caad52..3cd1473e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -31,7 +31,7 @@ public class PatientVisitRecordSaveDto { */ @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") @NotNull(message = "就诊类型不能为空") - private String visitType; + private String visitMethod; /** 主要诊断 */ @ApiModelProperty(value = "主要诊断") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index ddc7c21f..c2382690 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -2,7 +2,7 @@ package com.xinelu.manage.service.patientvisitrecord.impl; import com.xinelu.common.constant.Constants; import com.xinelu.common.constant.NodeTypeConstants; -import com.xinelu.common.constant.VisitTypeConstants; +import com.xinelu.common.constant.VisitMethodConstants; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; @@ -99,15 +99,15 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 住院时间，出院时间-入院时间 long daysBetween = ChronoUnit.DAYS.between(saveDto.getAdmissionTime(), saveDto.getDischargeTime()); patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, saveDto.getVisitType())) { + if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, saveDto.getVisitMethod())) { patientVisitRecord.setVisitDate(saveDto.getDischargeTime()); - } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, saveDto.getVisitType())) { + } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, saveDto.getVisitMethod())) { patientVisitRecord.setVisitDate(saveDto.getAdmissionTime()); } int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); if (flag > 0) { // 修改患者信息 - patientInfo.setVisitMethod(saveDto.getVisitType()); + patientInfo.setVisitMethod(saveDto.getVisitMethod()); patientInfo.setDepartmentId(saveDto.getDepartmentId()); patientInfo.setDepartmentName(saveDto.getDepartmentName()); patientMapper.updatePatientInfo(patientInfo); @@ -133,9 +133,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 住院时间，出院时间-入院时间 long daysBetween = ChronoUnit.DAYS.between(updDto.getAdmissionTime(), updDto.getDischargeTime()); patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, updDto.getVisitType())) { + if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, updDto.getVisitMethod())) { patientVisitRecord.setVisitDate(updDto.getDischargeTime()); - } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, updDto.getVisitType())) { + } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, updDto.getVisitMethod())) { patientVisitRecord.setVisitDate(updDto.getAdmissionTime()); } int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); @@ -143,7 +143,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 查询患者信息 PatientInfo patientInfo = patientMapper.selectPatientInfoById(updDto.getPatientId()); // 修改患者信息 - patientInfo.setVisitMethod(updDto.getVisitType()); + patientInfo.setVisitMethod(updDto.getVisitMethod()); patientInfo.setDepartmentId(updDto.getDepartmentId()); patientInfo.setDepartmentName(updDto.getDepartmentName()); patientMapper.updatePatientInfo(patientInfo); @@ -197,11 +197,11 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 在院患者 case Constants.IN_HOSPITAL: case Constants.DISCHARGED: - patientVisitRecord.setVisitType(VisitTypeConstants.BE_HOSPITALIZED); + patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_HOSPITALIZED); break; // 门诊患者 case Constants.OUTPATIENT: - patientVisitRecord.setVisitType(VisitTypeConstants.OUTPATIENT_SERVICE); + patientVisitRecord.setVisitMethod(VisitMethodConstants.OUTPATIENT_SERVICE); patientVisitRecord.setInHospitalNumber(item.getOutpatientNumber());// 门诊、住院号共用一个字段 break; } @@ -279,7 +279,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 根据门诊/住院编号查询是否有记录 PatientVisitRecordDto recordQuery = new PatientVisitRecordDto(); - recordQuery.setVisitType(patientType); + recordQuery.setVisitMethod(patientType); recordQuery.setInHospitalNumber(patientVisitRecord.getInHospitalInfo()); List patientVisitRecordList = patientVisitRecordMapper.selectPatientVisitRecordList(recordQuery); if (CollectionUtils.isEmpty(patientVisitRecordList)) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index cbbb3c35..e69194cc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -15,12 +15,12 @@ import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHar import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; import com.xinelu.manage.dto.signpatientpackage.SignPatientPackageSaveDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; -import com.xinelu.manage.mapper.servicepackage.ServicePackageMapper; import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper; import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; @@ -29,6 +29,7 @@ import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHar import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; +import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; @@ -66,8 +67,6 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { @Resource private SignPatientInformedMapper signPatientInformedMapper; @Resource - private ServicePackageMapper servicePackageMapper; - @Resource private SpecialDiseaseRouteMapper specialDiseaseRouteMapper; @Resource private SignPatientManageRouteMapper signPatientManageRouteMapper; @@ -75,6 +74,8 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { private SpecialDiseaseNodeMapper specialDiseaseNodeMapper; @Resource private SignPatientManageRouteNodeMapper manageRouteNodeMapper; + @Resource + private SpecialDiseaseTriggerConditionMapper triggerConditionMapper; @Override public List selectList(SignPatientListDto signPatientRecord) { return signPatientRecordMapper.selectList(signPatientRecord); @@ -102,15 +103,18 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { @Override @Transactional(rollbackFor = Exception.class) public int add(SignPatientAddDto body) { - if (ObjectUtils.isEmpty(body.getSignPackage())) { + SignPatientPackageSaveDto signPatientPackageDto = body.getSignPackage(); + if (ObjectUtils.isEmpty(signPatientPackageDto)) { + throw new ServiceException("请选择服务包"); + } + if (signPatientPackageDto.getServicePackageId() == null) { throw new ServiceException("请选择服务包"); } - SignPatientPackageSaveDto signPatientPackageDto = body.getSignPackage(); if (ObjectUtils.isNotEmpty(body.getRecord())) { SignPatientRecord signPatientRecord = body.getRecord(); signPatientRecord.setId(null); if (signPatientRecord.getPatientId() == null) { - throw new ServiceException("数据错误"); + throw new ServiceException("请选择签约居民"); } PatientInfo patient = patientInfoMapper.selectPatientInfoById(signPatientRecord.getPatientId()); if (ObjectUtils.isEmpty(patient)) { @@ -176,6 +180,12 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { // 批量保存 manageRouteNodeMapper.insertBatch(manageNodeList); // 保存触发条件 + SpecialDiseaseTriggerCondition triggerConditionQuery = new SpecialDiseaseTriggerCondition(); + triggerConditionQuery.setRouteId(body.getRouteId()); + List triggerConditions = triggerConditionMapper.selectSpecialDiseaseTriggerConditionList(triggerConditionQuery); + //triggerConditions.stream().map(item->{ + // + //}) } // 保存硬件 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java index dfd96af0..8c65fca7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java @@ -64,24 +64,48 @@ public class SignPatientInfoVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime signTime; + /** + * 签约时所属医院id + */ + @ApiModelProperty (value = "签约时所属医院id") + private Long hospitalAgencyId; + /** * 签约时所属医院名称 */ @ApiModelProperty(value = "签约时所属医院名称") private String hospitalAgencyName; + /** + * 签约时所属院区id + */ + @ApiModelProperty(value = "签约时所属院区id") + private Long campusAgencyId; + /** * 签约时所属院区名称 */ @ApiModelProperty(value = "签约时所属院区名称") private String campusAgencyName; + /** + * 签约时所属科室id + */ + @ApiModelProperty(value = "签约时所属科室id") + private Long departmentId; + /** * 签约时所属科室名称 */ @ApiModelProperty(value = "签约时所属科室名称") private String departmentName; + /** + * 签约时所属病区id + */ + @ApiModelProperty(value = "签约时所属病区id") + private Long wardId; + /** * 签约时所属病区名称 */ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index 44a50ec8..75538cf3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -29,7 +29,6 @@ - @@ -40,7 +39,7 @@ - + @@ -67,9 +66,9 @@ sign_time, certificate_issuing_doctor, visit_method, main_diagnosis, attending_physician, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, - admission_number, responsible_nurse, visit_serial_number, surgical_name, + responsible_nurse, visit_serial_number, surgical_name, admission_date, discharge_date, medical_record_content, appointment_treatment_group, - registration_no, registration_date, appointment_date, outpatient_number, visit_time, discharge_method, + registration_no, registration_date, appointment_date, in_hospital_number, visit_time, discharge_method, open_id, union_id, patient_source, del_flag, create_by, create_time, update_by, update_time from patient_info @@ -217,9 +216,6 @@ ward_id, ward_name, - - - admission_number, responsible_nurse, @@ -246,7 +242,7 @@ appointment_date, - outpatient_number, + in_hospital_number, visit_time, @@ -318,8 +314,6 @@ #{wardName}, - #{admissionNumber}, - #{responsibleNurse}, #{visitSerialNumber}, @@ -340,7 +334,7 @@ #{appointmentDate}, - #{outpatientNumber}, + #{inHospitalNumber}, #{visitTime}, @@ -438,9 +432,6 @@ ward_name = #{wardName}, - admission_number = - #{admissionNumber}, - responsible_nurse = #{responsibleNurse}, @@ -471,8 +462,8 @@ appointment_date = #{appointmentDate}, - outpatient_number = - #{outpatientNumber}, + in_hospital_number = + #{inHospitalNumber}, visit_time = #{visitTime}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index e54f2fe3..602c3cf3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -16,7 +16,7 @@ - + @@ -59,8 +59,8 @@ and patient_id = #{patientId} - - and visit_type = #{visitType} + + and visit_method = #{visitMethod} and in_hospital_number = #{inHospitalNumber} @@ -105,7 +105,7 @@ nation, - visit_type, + visit_method, visit_date, @@ -189,7 +189,7 @@ #{nation}, - #{visitType}, + #{visitMethod}, #{visitDate}, @@ -287,8 +287,8 @@ nation = #{nation}, - visit_type = - #{visitType}, + visit_method = + #{visitMethod}, visit_date = #{visitDate}, @@ -414,7 +414,7 @@ (#{item.patientId,jdbcType=NUMERIC},#{item.cardNo,jdbcType=VARCHAR}, #{item.patientName,jdbcType=VARCHAR},#{item.patientPhone,jdbcType=VARCHAR},#{item.familyMemberPhone,jdbcType=VARCHAR}, #{item.address,jdbcType=VARCHAR},#{item.sex,jdbcType=VARCHAR},#{item.birthDate,jdbcType=TIMESTAMP}, - #{item.age,jdbcType=NUMERIC},#{item.nation,jdbcType=VARCHAR},#{item.visitType,jdbcType=VARCHAR}, + #{item.age,jdbcType=NUMERIC},#{item.nation,jdbcType=VARCHAR},#{item.visitMethod,jdbcType=VARCHAR}, #{item.visitDate,jdbcType=TIMESTAMP},#{item.visitName,jdbcType=VARCHAR},#{item.hospitalAgencyId,jdbcType=NUMERIC}, #{item.hospitalAgencyName,jdbcType=VARCHAR},#{item.campusAgencyId,jdbcType=NUMERIC},#{item.campusAgencyName,jdbcType=VARCHAR}, #{item.departmentId,jdbcType=NUMERIC},#{item.departmentName,jdbcType=VARCHAR},#{item.wardId,jdbcType=NUMERIC}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index 27dcd27a..1d75a449 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -398,10 +398,11 @@ select sign.id,sign.patient_id,sign.patient_name, sign.patient_phone,sign.card_no,sign.sex, sign.birth_date,sign.sign_time, - sign.hospital_agency_id,sign.hospital_agency_name, - sign.campus_agency_name,sign.department_name, - sign.ward_name,sign.visit_serial_number, - sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, + sign.hospital_agency_id, sign.hospital_agency_name, + sign.campus_agency_id, sign.campus_agency_name, + sign.department_id, sign.department_name, + sign.ward_id, sign.ward_name, + sign.visit_serial_number, sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, sign.service_status,sign.sign_status,sign.payment_status,sign.price,sign.health_manage_id,sign.health_manage_name, p.service_package_id, p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time, p.package_term, p.package_term_unit, route.route_id, route.route_name From b61567b32efbe48fe4322d68f1faa8cc42cfadc7 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 20 Mar 2024 17:47:52 +0800 Subject: [PATCH 15/32] =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskpartitiondict/TaskPartitionDict.java | 7 +++++++ .../SpecialDiseaseNodeDTO.java | 21 +++++++++++++++++++ .../TaskPartitionDictMapper.xml | 9 ++++++++ 3 files changed, 37 insertions(+) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java index bc262300..8f3e886c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java @@ -92,6 +92,13 @@ public class TaskPartitionDict extends BaseEntity { @Excel(name = "任务细分备注") private String taskPartitionRemark; + /** + * 任务细分模板内容 + */ + @ApiModelProperty(value = "任务细分模板内容") + @Excel(name = "任务细分模板内容") + private String taskPartitionContent; + @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java new file mode 100644 index 00000000..1fc9cd53 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java @@ -0,0 +1,21 @@ +package com.xinelu.manage.dto.specialdiseasenode; + +import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * 专病路径-管理节点信息对象 special_disease_node + * + * @author xinelu + * @date 2024-03-13 + */ +@Data +@ApiModel(value = "专病路径-管理节点信息对象", description = "special_disease_node") +public class SpecialDiseaseNodeDTO { + + + List specialDiseaseNodeList; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml index 22e0b96d..d646c708 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml @@ -14,6 +14,7 @@ + @@ -30,6 +31,7 @@ execution_time, task_partition_sort, task_partition_remark, + task_partition_content, create_by, create_time, update_by, @@ -93,6 +95,8 @@ task_partition_remark, + task_partition_content, + create_by, create_time, @@ -119,6 +123,8 @@ #{taskPartitionRemark}, + #{taskPartitionContent}, + #{createBy}, #{createTime}, @@ -157,6 +163,9 @@ task_partition_remark = #{taskPartitionRemark}, + task_partition_content = + #{taskPartitionContent}, + create_by = #{createBy}, From 992405f747e965baddbd570bb86fa7d704ba5ace Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 22 Mar 2024 09:45:47 +0800 Subject: [PATCH 16/32] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientTaskPushRecordController.java | 97 ++++++++++ .../PatientTaskPushRecord.java | 104 ++++++++++ .../PatientTaskPushRecordMapper.java | 62 ++++++ .../IPatientTaskPushRecordService.java | 65 +++++++ .../PatientTaskPushRecordServiceImpl.java | 100 ++++++++++ .../PatientTaskPushRecordMapper.xml | 177 ++++++++++++++++++ 6 files changed, 605 insertions(+) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskpushrecord/PatientTaskPushRecordController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskpushrecord/PatientTaskPushRecord.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskpushrecord/PatientTaskPushRecordMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/IPatientTaskPushRecordService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/impl/PatientTaskPushRecordServiceImpl.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patienttaskpushrecord/PatientTaskPushRecordMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskpushrecord/PatientTaskPushRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskpushrecord/PatientTaskPushRecordController.java new file mode 100644 index 00000000..db90879a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskpushrecord/PatientTaskPushRecordController.java @@ -0,0 +1,97 @@ +package com.xinelu.manage.controller.patienttaskpushrecord; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord; +import com.xinelu.manage.service.patienttaskpushrecord.IPatientTaskPushRecordService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 患者管理任务推送方式记录Controller + * + * @author xinelu + * @date 2024-03-21 + */ +@RestController +@RequestMapping("/system/taskPushRecord") +public class PatientTaskPushRecordController extends BaseController { + @Resource + private IPatientTaskPushRecordService patientTaskPushRecordService; + + /** + * 查询患者管理任务推送方式记录列表 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:list')") + @GetMapping("/list") + public TableDataInfo list(PatientTaskPushRecord patientTaskPushRecord) { + startPage(); + List list = patientTaskPushRecordService.selectPatientTaskPushRecordList(patientTaskPushRecord); + return getDataTable(list); + } + + /** + * 导出患者管理任务推送方式记录列表 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:export')") + @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PatientTaskPushRecord patientTaskPushRecord) { + List list = patientTaskPushRecordService.selectPatientTaskPushRecordList(patientTaskPushRecord); + ExcelUtil util = new ExcelUtil<>(PatientTaskPushRecord.class); + util.exportExcel(response, list, "患者管理任务推送方式记录数据"); + } + + /** + * 获取患者管理任务推送方式记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientTaskPushRecordService.selectPatientTaskPushRecordById(id)); + } + + /** + * 新增患者管理任务推送方式记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:add')") + @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody PatientTaskPushRecord patientTaskPushRecord) { + return toAjax(patientTaskPushRecordService.insertPatientTaskPushRecord(patientTaskPushRecord)); + } + + /** + * 修改患者管理任务推送方式记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:edit')") + @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody PatientTaskPushRecord patientTaskPushRecord) { + return toAjax(patientTaskPushRecordService.updatePatientTaskPushRecord(patientTaskPushRecord)); + } + + /** + * 删除患者管理任务推送方式记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskPushRecord:remove')") + @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientTaskPushRecordService.deletePatientTaskPushRecordByIds(ids)); + } + + + @GetMapping("/getManageRouteNode") + public AjaxResult getManageRouteNode(Long manageRouteNodeId) { + return AjaxResult.success(patientTaskPushRecordService.getManageRouteNode(manageRouteNodeId)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskpushrecord/PatientTaskPushRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskpushrecord/PatientTaskPushRecord.java new file mode 100644 index 00000000..c016f63c --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskpushrecord/PatientTaskPushRecord.java @@ -0,0 +1,104 @@ +package com.xinelu.manage.domain.patienttaskpushrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 患者管理任务推送方式记录对象 patient_task_push_record + * + * @author xinelu + * @date 2024-03-21 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者管理任务推送方式记录对象", description = "patient_task_push_record") +public class PatientTaskPushRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 患者表id + */ + @ApiModelProperty(value = "患者表id") + @Excel(name = "患者表id") + private Long patientId; + + /** + * 签约患者管理任务节点表id + */ + @ApiModelProperty(value = "签约患者管理任务节点表id") + @Excel(name = "签约患者管理任务节点表id") + private Long manageRouteNodeId; + + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名") + private String patientName; + + /** + * 管理路径节点名称 + */ + @ApiModelProperty(value = "管理路径节点名称") + @Excel(name = "管理路径节点名称") + private String routeNodeName; + + /** + * 管理任务推送方式，微信小程序：微信公众号：，短信：，IM： + */ + @ApiModelProperty(value = "管理任务推送方式，微信小程序：微信公众号：，短信：，IM：") + @Excel(name = "管理任务推送方式，微信小程序：微信公众号：，短信：，IM：") + private String taskPushType; + + /** + * 管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") + private Date taskPushDate; + + /** + * 管理任务推送备注 + */ + @ApiModelProperty(value = "管理任务推送备注") + @Excel(name = "管理任务推送备注") + private String taskPushRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("patientId", getPatientId()) + .append("manageRouteNodeId", getManageRouteNodeId()) + .append("patientName", getPatientName()) + .append("routeNodeName", getRouteNodeName()) + .append("taskPushType", getTaskPushType()) + .append("taskPushDate", getTaskPushDate()) + .append("taskPushRemark", getTaskPushRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskpushrecord/PatientTaskPushRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskpushrecord/PatientTaskPushRecordMapper.java new file mode 100644 index 00000000..b211a25d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskpushrecord/PatientTaskPushRecordMapper.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.mapper.patienttaskpushrecord; + +import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord; + +import java.util.List; + + +/** + * 患者管理任务推送方式记录Mapper接口 + * + * @author xinelu + * @date 2024-03-21 + */ +public interface PatientTaskPushRecordMapper { + /** + * 查询患者管理任务推送方式记录 + * + * @param id 患者管理任务推送方式记录主键 + * @return 患者管理任务推送方式记录 + */ + public PatientTaskPushRecord selectPatientTaskPushRecordById(Long id); + + /** + * 查询患者管理任务推送方式记录列表 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 患者管理任务推送方式记录集合 + */ + List selectPatientTaskPushRecordList(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 新增患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + int insertPatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 修改患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + int updatePatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 删除患者管理任务推送方式记录 + * + * @param id 患者管理任务推送方式记录主键 + * @return 结果 + */ + int deletePatientTaskPushRecordById(Long id); + + /** + * 批量删除患者管理任务推送方式记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deletePatientTaskPushRecordByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/IPatientTaskPushRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/IPatientTaskPushRecordService.java new file mode 100644 index 00000000..38490917 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/IPatientTaskPushRecordService.java @@ -0,0 +1,65 @@ +package com.xinelu.manage.service.patienttaskpushrecord; + +import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord; +import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; + +import java.util.List; + + +/** + * 患者管理任务推送方式记录Service接口 + * + * @author xinelu + * @date 2024-03-21 + */ +public interface IPatientTaskPushRecordService { + /** + * 查询患者管理任务推送方式记录 + * + * @param id 患者管理任务推送方式记录主键 + * @return 患者管理任务推送方式记录 + */ + public PatientTaskPushRecord selectPatientTaskPushRecordById(Long id); + + /** + * 查询患者管理任务推送方式记录列表 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 患者管理任务推送方式记录集合 + */ + List selectPatientTaskPushRecordList(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 新增患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + int insertPatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 修改患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + int updatePatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord); + + /** + * 批量删除患者管理任务推送方式记录 + * + * @param ids 需要删除的患者管理任务推送方式记录主键集合 + * @return 结果 + */ + int deletePatientTaskPushRecordByIds(Long[] ids); + + /** + * 删除患者管理任务推送方式记录信息 + * + * @param id 患者管理任务推送方式记录主键 + * @return 结果 + */ + int deletePatientTaskPushRecordById(Long id); + + SignPatientManageRouteNode getManageRouteNode(Long manageRouteNodeId); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/impl/PatientTaskPushRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/impl/PatientTaskPushRecordServiceImpl.java new file mode 100644 index 00000000..dcf74bad --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskpushrecord/impl/PatientTaskPushRecordServiceImpl.java @@ -0,0 +1,100 @@ +package com.xinelu.manage.service.patienttaskpushrecord.impl; + +import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord; +import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; +import com.xinelu.manage.mapper.patienttaskpushrecord.PatientTaskPushRecordMapper; +import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; +import com.xinelu.manage.service.patienttaskpushrecord.IPatientTaskPushRecordService; +import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 患者管理任务推送方式记录Service业务层处理 + * + * @author xinelu + * @date 2024-03-21 + */ +@Service +public class PatientTaskPushRecordServiceImpl implements IPatientTaskPushRecordService { + @Resource + private PatientTaskPushRecordMapper patientTaskPushRecordMapper; + @Resource + private ISignPatientManageRouteNodeService manageRouteNodeService; + + /** + * 查询患者管理任务推送方式记录 + * + * @param id 患者管理任务推送方式记录主键 + * @return 患者管理任务推送方式记录 + */ + @Override + public PatientTaskPushRecord selectPatientTaskPushRecordById(Long id) { + return patientTaskPushRecordMapper.selectPatientTaskPushRecordById(id); + } + + /** + * 查询患者管理任务推送方式记录列表 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 患者管理任务推送方式记录 + */ + @Override + public List selectPatientTaskPushRecordList(PatientTaskPushRecord patientTaskPushRecord) { + return patientTaskPushRecordMapper.selectPatientTaskPushRecordList(patientTaskPushRecord); + } + + /** + * 新增患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + @Override + public int insertPatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord) { + patientTaskPushRecord.setCreateTime(LocalDateTime.now()); + return patientTaskPushRecordMapper.insertPatientTaskPushRecord(patientTaskPushRecord); + } + + /** + * 修改患者管理任务推送方式记录 + * + * @param patientTaskPushRecord 患者管理任务推送方式记录 + * @return 结果 + */ + @Override + public int updatePatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord) { + patientTaskPushRecord.setUpdateTime(LocalDateTime.now()); + return patientTaskPushRecordMapper.updatePatientTaskPushRecord(patientTaskPushRecord); + } + + /** + * 批量删除患者管理任务推送方式记录 + * + * @param ids 需要删除的患者管理任务推送方式记录主键 + * @return 结果 + */ + @Override + public int deletePatientTaskPushRecordByIds(Long[] ids) { + return patientTaskPushRecordMapper.deletePatientTaskPushRecordByIds(ids); + } + + /** + * 删除患者管理任务推送方式记录信息 + * + * @param id 患者管理任务推送方式记录主键 + * @return 结果 + */ + @Override + public int deletePatientTaskPushRecordById(Long id) { + return patientTaskPushRecordMapper.deletePatientTaskPushRecordById(id); + } + + @Override + public SignPatientManageRouteNode getManageRouteNode(Long manageRouteNodeId) { + return manageRouteNodeService.selectSignPatientManageRouteNodeById(manageRouteNodeId); + } +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskpushrecord/PatientTaskPushRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskpushrecord/PatientTaskPushRecordMapper.xml new file mode 100644 index 00000000..913c5ce2 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskpushrecord/PatientTaskPushRecordMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + select id, + patient_id, + manage_route_node_id, + patient_name, + route_node_name, + task_push_type, + task_push_date, + task_push_remark, + create_by, + create_time, + update_by, + update_time + from patient_task_push_record + + + + + + + + insert into patient_task_push_record + + patient_id, + + manage_route_node_id, + + patient_name, + + route_node_name, + + task_push_type, + + task_push_date, + + task_push_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientId}, + + #{manageRouteNodeId}, + + #{patientName}, + + #{routeNodeName}, + + #{taskPushType}, + + #{taskPushDate}, + + #{taskPushRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_task_push_record + + patient_id = + #{patientId}, + + manage_route_node_id = + #{manageRouteNodeId}, + + patient_name = + #{patientName}, + + route_node_name = + #{routeNodeName}, + + task_push_type = + #{taskPushType}, + + task_push_date = + #{taskPushDate}, + + task_push_remark = + #{taskPushRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from patient_task_push_record + where id = #{id} + + + + delete from patient_task_push_record where id in + + #{id} + + + \ No newline at end of file From e8438abe5955795015a10a2fba33448d05eb4245 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 22 Mar 2024 17:34:24 +0800 Subject: [PATCH 17/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/预住院患者信息导入表.xlsx | Bin 11749 -> 11802 bytes .../common/enums/PatientSourceEnum.java | 21 +++++ .../xinelu/common/utils/poi/ExcelUtil.java | 8 ++ .../patientinfo/PatientInfoController.java | 1 + .../PatientVisitRecordController.java | 20 +++- .../PatientPreHospitalization.java | 15 +++ .../mapper/patientinfo/PatientInfoMapper.java | 3 + .../PatientPreHospitalizationServiceImpl.java | 79 ++++++++-------- .../IPatientVisitRecordService.java | 10 +- .../impl/PatientVisitRecordServiceImpl.java | 89 ++++++++++++++++-- .../vo/patientinfo/PatientBaseInfoVo.java | 51 ++++++++++ .../manage/patientinfo/PatientInfoMapper.xml | 7 ++ .../PatientPreHospitalizationMapper.xml | 10 +- .../PatientVisitRecordMapper.xml | 4 +- .../SignPatientRecordMapper.xml | 1 + 15 files changed, 258 insertions(+), 61 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/PatientSourceEnum.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java diff --git a/postdischarge-admin/src/main/resources/template/预住院患者信息导入表.xlsx b/postdischarge-admin/src/main/resources/template/预住院患者信息导入表.xlsx index 708660dfe1d1d547d3bd1fbc7fe2d1488e66e7d9..595b974aade9314faa73223ee03b65555ff3cde9 100644 GIT binary patch delta 5761 zcmZ8lWmJ_-v_6OCNOO>mLzlFabcb|zgS2$>3Q|gQ=YY%Vc!*J%ISsWK z)}aE@qFW_>T-1mMGdt4h=AzbX=r%&)IFmP0O=C7uh<;>82o`P#tFLF&BBRCRA)ycH zk;!sCTnlncJqS!N`zh;viN1d2;c~MW?A*K7)+p^WGme+Q(OSIqW%Gt*WF$ zrn+{e!F6ceJ|qp^vV;R7A{`xV{;eWKznb(@A!~gFDO;aMgbe(JE!b#GDIbkm~i80P&=m#P%eG3+lk~im0gYBZ8_TA`%n? z0-=GzmAAy^iC!2JJ&Iel!ceN>?!n41~NdPJRu;ozvSWW8$Vp1xwZw3OgH&th&$Vbr#zu z3plC>dC$=YJZ`q^qbi0^y8(=v#0P{jT$8 zsAH|Yoqq@x?E-7-mixE&JtB|r12F^-?s!q1Jq%|(qAcX*D}s^Wc(ufeuxyLhiu#TV zc7L#f&!NRss?k@U)-?^r1;6xiwCmb@Ub zuU1EZ*38dc7$q^(O~Gyy^o&a^ZOaDnJ%OEVRY%6AwEU96mAu7Bh(^k5t^Ip8B7@NH zAih^wQ#>d^vPBM<1WpDNtoQcjhJvfNX4$BlLP#h2c>X>O+e!y`=0 z{ow9rx7cZ2y)DVFcE5DB>N*-xWD($?41HAu?kv~Ms|3CNxYlO*>sekumsu&1&7ES) zIvI&Rp2J_Ls|@n130DR}`xNS`{8Bwki?o6(aepdcGX&T;(MPZ4fk%=qgLKKVpc!hd z+*lK7Io<~+y+k;qC+DvTvS zW^bY_&)SHrOQy{1`ewVS@(#+FfVw6he4k(DfU;%2Nv2tKeETxq@1(8=1KZ#|5u+Aze6CxiR2Y+0x8nKM(`u~drgfFzqE zy>ZgQl0%+kTWHmTb~fduzgo6QMs!N_Wdc2?kr{h5IciKbzl~0(5a%Pb*XO4pPl-@Q zOZepvvi|jhO#F4*lp-Pz#DWeH|tnBR}g6YeI)IlR`}B2IJpyT;riv}q93_e)<} ztIjM+w_+sNdP(<|rN;=dwMTp5EvZ~jQRc3X#GHlZBxM1jA|sk0X1{&OaTj#7 z;fkv<@3&!2$*Mi4u5+&D~zdz5?=*4@)%RRP9oQh>F$$YRFKBfzQ2L2 zLHW-izRs0RQMiqXfdgvGx<&NLm0Yr>(z2C|-&+W>ZVLt-$ePb3^6Qe(>S#XxaSQ|d|cMaT`E^dJmiRodSr~+?N~|kTc89Koijf*>&?DO z%tJB2&`Wbgnt{Vg);W?ReZI}FG+_mOCX4eswo^(|1^-K{jO>R$DoRL=<*zaMyzCkh z^RFkIscaywN0MdbZ>9+gq@mm9g`>A$!}wtl+(X)CH`S1oPOul1BkpNvL7VCGA*hFG|DB3qX@oToJH z7`T)0+`xvo?P^(-{JUe~WCpV~Uz7`?c@W*iELfpz^ue3cbMSHED4#-N8icvhC~hD@ zuv+V^>Eu(^n(2shJs}GzI(D(Hl(zER9H^XlvwvbA?v<3+EwwFp4v~U6mQ-k z*UZ))EBtP9FCN5yMA$P1R@{W=E%-9hT)41ngm3&GPXK`%`_{nYZytrOl11y=#0|7{ zSZXaXTa3pkjv9BHoQPSJ^hi*?=h_IaeX|=5pHppbJfHnsf&E^xzopqmF9?YhrMt0} z5b3x5N3Nq2y($62pVyUO|LGh5d5n#@b*-@9?N--eAp;)JO7$|9DqHNGxbF1j7hOFs z|4>F<>$CvbU!75|V~!U(VY_sSPF}}-C*Lkd$x$_h&kQ(izGRvoFBz?q`u;H`&}B02 zaQ3QX!klf{GVpTP%1Umn5g}?0BgH7H;v+$FY)%$R=yGT56E!Y`w$xIN>kwWP;->=hw&uq|$hwHHLn5?a)ye2{Cg5S*~roN7N5$Yw_d1)>QCaBIB<&G&PLi` z+kOIsrzs_J(9u5$`pEdbo|$R@cWC-E(ikLke4S3lERc9aL&m?6!EikI`n`$um10!_ zgM`EDk6*9mq9qVydenpZ6-kCl?gHJ}kd_h%43AcdlK$@D@*Nur$F{{~9 zlDN09M#5R-+Sie9C6KiD!tr;8<#JuxYP6asl(Q}J#2?wFinzC$_z!!MOq~w!WWs** zhB<~28jzPF5iUKmhJ2d;?yLu`dWPISQ0mi_uT_dKO%O#ow87>}!Irp)BjeM!O=}SV zlqPP%qdii+kdj3?Htd;N+C9Et7qo+4$4AUT@Kxj0`skmw%Jdbh8ezPnVHN*3V>%#3ow}(PvC&ABa=z~ z8OU68Sf(C?JTIPjmA(FcRGMjtLxY7Q05iw2;+3}OyAOrVrzi1`K}{;fNya$eJXiXB z$9cWlf)2hF;c4_dqSGBIbfH)pU|pLcavIRAFNk&-cJfMp8kG z1RCV2H=gaw<_nfYLZ>K@qYewcN>Jo>v|;=3Z3-|<&u{#GMOZ`D{VrOgWfH;mR_KrV zg2tDJY-jFy|6~%igLeuu4P<-tOvLL447+j+HiB4p`*Fx*04!r`hYYnj#A;=qi&c0N z^H(&@)InZ^5cA;5x)&DahO$q%7uCB}$0_r{lh3cNPrfy9bY`>@>aM<{n1eOUL}kQr z3k3nIbp5z3VrHQ>XjpelS_PK`DH1wF(L4S5P-D#4dqYUck1Ob8kt)GY>8Z}10M4k# zCfSpiUDB&k;zLo(_hG9qa=l>DKNU+jhrBkNl21V#JUUjtQipBa26P8Xs@=T@RmHIC zjM!EZBwbPzEp#(*>@cXZLk-yYMhKe<<30fX`V^RE#%$WSQ@Zk*sb$oq#=5<|b0B`g zbZ-K(L3L)@T4LsL!YF29kklI_;Z*gwPst@v=Ce$7#h=jf%?+~eOat-5mr!q7EJ~^z zCS=>UVd{Md(^=_SKdG>jrKL5$ZzTA*cycXfJ|acaZoNS$&mTfbq0_=6;QPW_l0X8S z+a+Ggku#Mgmm0=RxuDmF=&P&0aOr72!0_j!L3d=U4|n^rBZF2ng}0sXX{=~Afo1;5 zPL$_Tvt_{!AD&94z}&8FZ9uh^zt?~8m%sN#uV-~W?!;w(0{!Hs>s)_y*?i#oxEEqOqB8ja>I5$_5k)rZ-OdC{eOA>Eyd5mkTrMgrj5yyS0gSOU#F#RS600a za&u}hRg$TT2b*=paV%UXd2rf`;oWbWS=%ESLa$~Jn=VbnHkm#wu59p2xFCLG?G)nG zUd&x~9V9pU6M34707I=`6LK^QQ$DcdS}xN-rH{+Y)e?dU>Hvih;&g3LFJ?&Jg+PHA z`x@g~(Z~newFQfa<^_K5mVHL*EdKYKVSK6UXVH`RUtx}(;1p%~fvqCmfx9Djoxqm? z;*#m_sCIL=MejFrXvO7s2+tgS?yn9Gw!PvQJY^aYZGz!Z+|p+oYfle;U&pW8MZb>d z!Eag-to~VI{=gk$g4^9`|8|LJG&&k@D%qXi=laYPz#mJ39#9F1+ZlVaADc48V^O$# z!@M3_6yGUQP}mVJuMzeGM#6Pv&2!aHpuzLl3|ybx?#%bska6Ky^K7y(t2+?^7v~3q zdp5Dk#_cy_w&~dzYQ)0A2-(R3xAP|BF>BGt36s<`z`IamF|qWmt3i{#4j-?J-vxue zfyje_Uzn4Vw5i1z{%_r{Hz~~_EfG<2At#~%_qdFF&A(GqWKukd9hD+tRWlQ5VYT+* z9#EMV)WOAOvf4gTrCrt1QWHGXTbtkv90Ycmf9!MI2TS(juIWAO{u_MvI3sFHT-Io` z9RMexKn0&kh}twuLdx}GFNGl%503($M0h4c+u>qzbucHUA3Kn*9dN$rv_XFn`%Hu1eGAgCU^f>?CZ5MqfuTd?${GedOxmNyr=sJ1~6A+PH^5M+SF zYZS5g`ZEWwkhRBu3lGeO4vap9AwG1VQf;R;6q#rVb;l$2>J7lvi0c2dqFul>*kCZlG0mt$9B@RMjMZo<&6CZ(?}t}Jos6I4#! zqDzIflDZv>&5qwZ3@RwvhMo?D6ya%^kTM9KB`b(>@v1-2`^_a!jvnrWd(0d{N-^Pi z3usoUtzX@?AO9&mV^~P)YAKb$$S%aRzC&2^x%hg!b^W#Q|r1dS1T&P}< z{g@mQfP?;d`{r~`m~ecZA3)K6H;AUK&;XO*`YiW;H@GR}AR{3Xh2{7oenKVHmpB4g zc^MFIzpPW*nb@fYgSzo}>rG`A3Z0U4%`j5SMJFknXxArk7^l?J_t#LrTfU~?6Fhap z6pt=idafBy9jthKk==?wfs}6#kD0sU)m>tfI#-OxmUvaXL_^o+-y8kRcL=g3Iw_%r z>u%IP|AMq8HYA(5XqRlA*L5HJLmsxiT{Z9yQ(h!}jlX5HZ|#TBm0pM@Wsl<~21G+Q z=I~w|WPxJ7vEXD%v{P|XNW!|06umLtbBXUq{AG^Wjmv%)sWFLGhhW^%&t?Vw`AfY19rrdHz8?E+Z3=`4C1!?~~KGt6|O3Bqc!AjJbf7)SI( zLt}{U4(O3>D|wkFKNiFNf$!#Pw-f!1li#nq#8EnDPx+R#@%5vd4EFHjy#w^C@i1y( zw>HD+oyn`0+v`t~7ZOc6GWZsr!zhM8Ndwa{1a1N*P{Q~NhHBMe@~`U)%v r-+jU+IP8Tu_}~c%;l3{@N&ix!s4@iU5fYKodNH+`&ozjgUNS6wd$_V1| zd7pF6b)B<6tiAWT?t8BEs^tewk`>X8A8dzDTdGjB?V?=j3odx(Y1d@Re}q>f3+qtPw%`}cR&Mz*w_f^ArPnvGE$Tv~{k zxdjOwq4qG`OkizXDvR={En^B*V_`piOK$~YAbC7WO800=Xah}2hS(sDEKL4OsL^xK zfRHhhf<*Ej=jfI#w(7bZwxshImsZD0M5XK*zt#CG@lLaLx)hy7Wu1kQbCgqyt8|euGL2T$b(Si=L&cCpr zh}vPvHR2XPNcA#%~UO_!mkb#`F^aF`ZN>GB8{O5xQ)Cr1G zUke?B3`UJ5t&ipW zpluP|w};#7es4712icU9?PQk8f8UN;x|!BZk-MkDrG7gVpm*c8AMlV*AZz#aa`GE` zI!%i&20t3%G{?rMKRO8HL<|Dag5V`Q^zaW@;kHN!-5kIfK&4hkbbXqEOpdOxW z`s(H`rn|r%OFnB(q`H-Vr2r=GubGcpqe#lnUre0|S`47z6BsH=K_Wh$2^CRvvQ2T@RhM{V3a$$g zxgsI)Sb}CV*p7ZMLr>L<8S#P$|BHvfJIwI#YvSJ!ih*I2oxMKb-VIcyoEU_XF%sWt zeMr+uoF_}+rx1B3U0MM6Qy4MKzYt~|@uM*T;_sp*GHAt*)D1SZ-|kVp1CDLCXbu!* z(q`4p5Pt$C7|RNzDJMv@hCER?hvHYaMfSQ%*yk8m+yq7)_vA-!k^_`mF#WY3B?LB&$~H`M;k{`Pck%;(f#u++>&F)42Iz);y;%1|Zn&^W?IPtXF0kM2p(egeh3j1w zM;7fdVvN}R{pWBQh#2n6Zpi}1zwHWwheMbE6C0m=L9+1T)<2Q=wm4kRWXTMlYb*wO z)VObswV=Nlt{#{QRBW;9OD15=;;xB_Zc3Y#>HWDM5`xO}cf~do%7`5f3LTE(B^8=n zVMd{xf<>XJ3nIx}l+-a#iIS{mWPv;i#oj7{$iQ@FBjz=?LOp3c6j`~$)O=TxvsKu3O99toNns~J_FSw$D#Fu#x1SL<)GhC!{(2tlA5^9vc zg@k+)z)1GNi_X+`k&56(e zn~qW|mWq><&f;QK!{V9mZu#|cbw`SD{;U0->Ti*>T$_n_btAd?;k1Qu5^~V;)sZhNS(N;$rNYJ@q^_Lu5H$e-2}RARw;&^K<`Bzy-9Mu z#g%QT^75jwi6mT!?yf`Q)DlWwnFp5PuP5a5@4kK2c?ym58n&Sna%brU0!j8ncdaOQ z`ZT`u#L`u60`TSdAoI`VHy8Bd%nb~dB^O}J_tg*fkE@aao0+($PuE{7d^&Wd&suyU zt&ecY^%rL~M-(OBWV8$CHc=pQM;01lMn$awuX9n1RG!22>yPb7oGwEuwYN;0R9(Vp3BxYK6~cWy=uF1<_rUvZ=Zh? z*I9TbDW&5fw7_rq%!Q3OS=D>Dl_JoZ&UGm|9m^$t@U4O(I)1IGF#rY_-C_zHVF4&sKQ)v%8)0y6|<#KK_zNzTNMMQ6|aDg8aMGM_m1H<=o!i8NeFr zpS_&v-TU-%dAt8)NUVqH`V_}|NXE;TSTZmuG9gS)m^=H)bjN0|rg-gLAyhj|>VDwd z{vGh>7CUhNtgDEY-odtdH)zG@+s(_l&o}bRLygn{ag(?!y`OMjD$FIDMrBi6hj@?W z>7NDjuaKBNvUu#C|DlU6w^H;Ku!~dbg6P2073;t^;Dr@-r!Dm8?%%Ye9L@%tFiTie!&s;tA=uxVb>J6 z3lxu(Rl=!Z4~YxK_d4m0wBs!rAAe1DcG_+{S-mZ%JTTltqGW}t|IIfxomq2`m`)4d ztw%mDOOIr3Hr^GQA)F*V9rv}uY?}zOOzp=KuaB}28tcjH=UT}Sx2bsEjg+EIXaV)R zGh2ihfVz+(gl8fzp5ui>5_zel2av#e?ewE^ht=tY+-Q-R+}3Uz|Kp01W_J@l^-khX zlV8v*DhvvkqL$ZoVy@W8-E10s%=p{jN9JxjeUq@0tlQ~X$zZk|i>{cA(g=h@{_cni zE%(5?AJOjzSKM1VQsTZEMhOVJQ#5W%nYZYxy*1I6EI{C3Pq~50q*t#pn`8lF&C90& z=!f(fkACpoT9&SMq!QXMt;TbaE|@E2A?kiA-l>cEdhw_V;z)NSw|?~4YjP>rV>%#K zKV1;mh**_?+4DEYjlH3%^ffrB7@DVZf5C7olY0r z$HwHs`_cthU9GR&79yVv$Hx8V9&kxX>ViCf@>iJ8g!hm6f7}5yX#ElMibGQ$?9_84 zPz_Wr(xtIn*WSc|4gm(Gv@Ri-6%G4qhjB;O&>Z!+v(K`>7%{QkEUA@AJjcAeVK$)x z$DbIi-Gx-{84U*OSv}?3m)sadiT6f)La8ueS1L-cIDc-mn`751dK>8ruRQMH6FQ7; zpIZZdzmAfv$~&+W(a3OGWmPD84kuIb!a#qTks5w1WfOGF5v6^I!FrGL2<43|NhqJq zcUyN}nbzE_rS=#;QkhOZCEix=83|NNic2r!q)<#PvB!}}nrzId`$pN8QO4=QqNYEm znz}o={*fTgH-Tw@t}5FG#N+OUef#xeTl$UOl!Bf7#p`8SOzS^^p;%wpSO zQRBn$(90^ayX}6d=18eSoilk*_ou;;%uTzW8$G?>&oO-B6!u}zFmvo>Ln-g*nR8{p z8=GG37!<2CLrnL>uzKN&T&t8PMfK9j0Md}jBB!-u{HPde2{A$RCP?NW1u}1e(Btot zrLk#wO%E?c-9B#8g-}*DAz(BCD8h~DOL`F2Q8hjz9?BDoI{Au=m!6**GUw2KFvurK z)?rOEv>s#Z1iBE}fFK;&J5^$}4}rx?H=HYfL{j>w=I*dIxx&pL_e=*?KVojUW?TKW zA#;X~L2$eM(mW{gEy=aLrb4}CfuVI2WtL@CWhV{cj6+d09YS0$N^SQXe3@&Qj#bI& zJT0_&VqrpbX>Vb?KS5{xSU^{g-KwRyq*Pg(qeRkdZM(T#(|?43fAW2K6oAwWV5nwc zTh8R6tb*}Iz1G*#tY%~MbC5*0)7DV53OL>Bx149b0DDmJLRV^Gr~~n?sGRbNB{4(IOM~E>~E&g zc08oTSZkawY@|7c;~9ou0f=#!9t%`~!mGHz!tukyyCzQY0sOpF=knf_+-;z7bX6Ei0-C2_-{;EsRE5}w1?+u)( z_^hH8e>*9Z{aWSBI^_j7`w0RP@&x%VwMbSb^qz1vJTSfhcthD2?MCs^tRi1TSV2>REj1SBe{WUdoiA%p-)8x<&MuQlW7tZrI%IY*O6o$DX zSu;)M11TEHMBKA*@(iIQEL|d=|DG5cB?T^^Y|#~2>ciN?ZZ)os-uPCv-DwpnhUUJTaT~B9ayZ%P`C(B({k}$ST`Wbde|JRnC01;r@S886KJ$ zJOi4U7Bx_p9h?e`mRws0Pvxn>3w7Ll?FKK&={jrVMZ#tjU~HOAtI%TL=$4Z z!75Zf=y%Z+%Kuweb-0#m#IwSTik1XXL5BF}iGDexf#LpNDRG%C*i;&w%SE_n@MA(w zoyNZoWpACNjeiSxP$4`=36$<|eiK4vuZmJm!FD#4u0%b@rkBoI&Z|D#z^X6Puh!-K zvqGjpUQ6z7_PR#O!lC0EFwzzCPqxEx`x4`K&*l72Qm>m9syv^VPE{LOJzHsSH*D3(8hcrv?2QXvH1fwSy(|q64dlD|i%n9VA&0&&NDdJkbtEgV!-7I1! z(r$!^HcyX>oc7Je&3S(jxqyZLGcMZM+7;*1gmEYu&OncOJ#la*gB8}eqKgT0+oI*U zry$k=s?gh)>M!W~fQ~c7i-%E^@En@9YNKH_0ZC@C3JotMl1+On%UZ@XGpAuOdMOek!Cir)*#{^N{r*c$K(9l|;e47WS+8ZC%VoSNRi(RC4e}`_In# z;9?IPci!dpk|Z*c>(7L55PgWr^*P6~y#j|D2EhKn-PF_H_Bt1Cp~cZy$BMADjK~Xqz~<;# z`?c2a4B}d5-b<~b6fnRhunavSps74}DVc!~%wyE(9?K-ImRY*ZeT(jmJixKm{PQ(R z-nTfS*%42+i{v`tS+!SzrE*dZ)T!Rb#-=uYiOA_;6 zD#*l54!(nna{GZr;Z@wCU>o=r_dCr0;4gS0k1aS0e$2x``~T;pzoQZe3}X5l^WogQ zl3*m { } else if (val instanceof Double) { val = DateUtil.getJavaDate((Double) val); } + } else if (LocalDate.class == fieldType) { + if (val instanceof String) { + val = DateUtils.parseDate(val); + } else if (val instanceof Double) { + val = DateUtil.getJavaDate((Double) val); + } + val = ((Date) val).toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) { val = Convert.toBool(val, false); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 73802e37..f2d730f5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -44,6 +44,7 @@ public class PatientInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:patientInfo:list')") @GetMapping("/list") public TableDataInfo list(PatientInfoDto patientInfo) { + // 根据用户权限判断查询数据权限 startPage(); List list = patientInfoService.selectPatientInfoList(patientInfo); return getDataTable(list); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 3bba4b5b..0e9f684c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -93,6 +93,7 @@ public class PatientVisitRecordController extends BaseController { /** * 新增患者就诊记录基本信息 */ + @ApiOperation("新增患者就诊记录基本信息") @PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping @@ -100,6 +101,17 @@ public class PatientVisitRecordController extends BaseController { return toAjax(patientVisitRecordService.insertPatientVisitRecord(patientVisitRecord)); } + /** + * 修改患者就诊记录基本信息 + */ + @ApiOperation("修改患者就诊记录基本信息") + @PreAuthorize("@ss.hasPermi('manage:visit:edit')") + @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Valid @RequestBody PatientVisitRecord patientVisitRecord) { + return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord)); + } + /** * 患者配置——就诊信息保存 */ @@ -116,12 +128,12 @@ public class PatientVisitRecordController extends BaseController { /** * 修改患者就诊记录基本信息 */ - @ApiOperation("修改患者就诊记录基本信息") + @ApiOperation("患者配置——就诊信息修改") @PreAuthorize("@ss.hasPermi('manage:visit:edit')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { - return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord)); + @PutMapping("updateRecord") + public AjaxResult updateRecord(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { + return toAjax(patientVisitRecordService.updateRecord(patientVisitRecord)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java index 556b997e..810bcba2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java @@ -1,5 +1,6 @@ package com.xinelu.manage.domain.patientprehospitalization; +import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,31 +29,37 @@ public class PatientPreHospitalization extends BaseEntity { * 姓名 */ @ApiModelProperty("姓名") + @Excel(name = "姓名") private String patientName; /** * 患者电话 */ @ApiModelProperty("患者电话") + @Excel(name = "电话") private String patientPhone; /** * 身份证号 */ @ApiModelProperty("身份证号") + @Excel(name = "身份证号") private String cardNo; /** * 性别，男：MALE，女：FEMALE */ @ApiModelProperty("性别，男：MALE，女：FEMALE") + @Excel(name = "性别",readConverterExp = "MALE=男,FEMALE=女") private String sex; /** * 出生日期，格式：yyyy-MM-dd */ @ApiModelProperty("出生日期，格式：yyyy-MM-dd") + @Excel(name = "出生日期") private LocalDate birthDate; /** * 家属电话 */ @ApiModelProperty("家属电话") + @Excel(name = "家属电话") private String familyMemberPhone; /** * 住址 @@ -63,6 +70,7 @@ public class PatientPreHospitalization extends BaseEntity { * 主要诊断 */ @ApiModelProperty("主要诊断") + @Excel(name = "诊断") private String mainDiagnosis; /** * 所属医院id @@ -93,6 +101,7 @@ public class PatientPreHospitalization extends BaseEntity { * 所属科室名称 */ @ApiModelProperty("所属科室名称") + @Excel(name = "科室名称") private String departmentName; /** * 所属病区id @@ -102,27 +111,32 @@ public class PatientPreHospitalization extends BaseEntity { /** * 所属病区名称 */ + @Excel(name = "预约病区") @ApiModelProperty("所属病区名称") private String wardName; /** * 预约治疗组（取值以及枚举未知？） */ @ApiModelProperty("预约治疗组（取值以及枚举未知？）") + @Excel(name = "预约治疗组") private String appointmentTreatmentGroup; /** * 登记号（预住院患者） */ @ApiModelProperty("登记号（预住院患者）") + @Excel(name = "登记号") private String registrationNo; /** * 登记日期（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty("登记日期（预住院患者），时间格式：yyyy-MM-dd") + @Excel(name = "登记日期") private LocalDate registrationDate; /** * 预约时间（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty("预约时间（预住院患者），时间格式：yyyy-MM-dd") + @Excel(name = "预约日期") private LocalDate appointmentDate; /** * 开证医生id @@ -133,6 +147,7 @@ public class PatientPreHospitalization extends BaseEntity { * 开证医生姓名 */ @ApiModelProperty("开证医生姓名") + @Excel(name = "开证医生") private String certificateIssuingDoctorName; /** * 责任护士 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java index c9bcb296..4f34621f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java @@ -2,6 +2,7 @@ package com.xinelu.manage.mapper.patientinfo; import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo; import java.util.List; /** @@ -19,6 +20,8 @@ public interface PatientInfoMapper { */ public PatientInfo selectPatientInfoById(Long id); + public PatientBaseInfoVo getPatientBaseInfo(Long id); + /** * 查询患者信息列表 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index 951d9b17..f2379c6a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -18,16 +18,16 @@ import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientprehospitalization.PatientPreHospitalizationMapper; import com.xinelu.manage.service.patientprehospitalization.IPatientPreHospitalizationService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author haown @@ -54,9 +54,10 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital @Override public int insert(PatientPreHospitalization preHospitalization) { - // 根据身份证号查询是否有患者信息 + // 根据身份证号+医院id查询是否有患者信息 PatientInfoDto patientInfoDto = new PatientInfoDto(); patientInfoDto.setCardNo(preHospitalization.getCardNo()); + patientInfoDto.setHospitalAgencyId(preHospitalization.getHospitalAgencyId()); List patientList = patientInfoMapper.selectPatientInfoList(patientInfoDto); if (CollectionUtils.isEmpty(patientList)) { // 保存患者信息 @@ -117,11 +118,15 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult importList(List patientList) { //判断添加的数据是否为空 if (CollectionUtils.isEmpty(patientList)) { return AjaxResult.error("请添加预住院患者导入信息！"); } + if (SecurityUtils.getLoginUser().getUser().getAgencyId() == null) { + return AjaxResult.error("您未设置机构信息，导入失败"); + } // 根据患者身份证号做去重处理 List importDataList = patientList.stream().filter(item -> StringUtils.isNotBlank(item.getCardNo())).distinct().collect(Collectors.toList()); // 校验联系电话格式是否正确 @@ -133,48 +138,32 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital for (PatientPreHospitalization item : importDataList) { PatientPreHospitalization preHospitalization = new PatientPreHospitalization(); BeanUtils.copyProperties(item, preHospitalization); - // 根据医院名称查询医院id - Agency agency = new Agency(); - if (StringUtils.isNotBlank(item.getHospitalAgencyName())) { - agency.setAgencyName(item.getHospitalAgencyName()); - agency.setNodeType(NodeTypeConstants.HOSPITAL); - List agencyList = agencyMapper.selectAgencyList(agency); - if (CollectionUtils.isNotEmpty(agencyList)) { - preHospitalization.setHospitalAgencyId(agencyList.get(0).getId()); - } - } else { - preHospitalization.setHospitalAgencyId(SecurityUtils.getLoginUser().getUser().getAgencyId()); - Agency agencyData = agencyMapper.selectAgencyById(SecurityUtils.getLoginUser().getUser().getAgencyId()); - if (ObjectUtils.isNotEmpty(agencyData)) { - preHospitalization.setHospitalAgencyName(agencyData.getAgencyName()); - } - } - // 查询院区id - if (StringUtils.isNotBlank(item.getCampusAgencyName())) { - agency.setAgencyName(item.getWardName()); - agency.setNodeType(NodeTypeConstants.CAMPUS); - List campusList = agencyMapper.selectAgencyList(agency); - if (CollectionUtils.isNotEmpty(campusList)) { - preHospitalization.setCampusAgencyId(campusList.get(0).getId()); - } + // 设置机构/院区为当前登录用户机构信息 + preHospitalization.setHospitalAgencyId(SecurityUtils.getLoginUser().getUser().getAgencyId()); + Agency agencyData = agencyMapper.selectAgencyById(SecurityUtils.getLoginUser().getUser().getAgencyId()); + if (ObjectUtils.isNotEmpty(agencyData)) { + if (StringUtils.equals(NodeTypeConstants.HOSPITAL, agencyData.getNodeType())) { // 节点类型为机构 + preHospitalization.setHospitalAgencyName(agencyData.getAgencyName()); + } else if (StringUtils.equals(NodeTypeConstants.CAMPUS, agencyData.getNodeType())) { // 节点类型为院区 + preHospitalization.setCampusAgencyId(agencyData.getId()); + preHospitalization.setCampusAgencyName(agencyData.getAgencyName()); + // 机构设为院区所属机构 + preHospitalization.setHospitalAgencyId(agencyData.getParentId()); + Agency agency = agencyMapper.selectAgencyById(agencyData.getParentId()); + preHospitalization.setHospitalAgencyName(agency.getAgencyName()); + } } // 查询科室id Department department = new Department(); if (StringUtils.isNotBlank(item.getDepartmentName())) { - department.setAgencyName(item.getHospitalAgencyName()); + department.setAgencyName(preHospitalization.getHospitalAgencyName()); department.setDepartmentName(item.getDepartmentName()); department.setNodeType(NodeTypeConstants.DEPARTMENT); List deptList = departmentMapper.selectDepartmentList(department); if (CollectionUtils.isNotEmpty(deptList)) { preHospitalization.setDepartmentId(deptList.get(0).getId()); } - } else { - preHospitalization.setDepartmentId(SecurityUtils.getLoginUser().getUser().getDepartmentId()); - Department department1 = departmentMapper.selectDepartmentById(SecurityUtils.getLoginUser().getUser().getDepartmentId()); - if (ObjectUtils.isNotEmpty(department1)) { - preHospitalization.setDepartmentName(department1.getDepartmentName()); - } } // 查询病区 if (StringUtils.isNotBlank(item.getWardName())) { @@ -187,28 +176,36 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } } + preHospitalization.setDelFlag(0); preHospitalization.setCreateTime(LocalDateTime.now()); preHospitalization.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - // 根据身份证号查询患者信息 + // 根据身份证号+机构id查询患者信息 PatientInfoDto patientQuery = new PatientInfoDto(); patientQuery.setCardNo(item.getCardNo()); + patientQuery.setHospitalAgencyId(preHospitalization.getHospitalAgencyId()); List patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery); if (CollectionUtils.isNotEmpty(patientInfoList)) { // 修改居民信息 PatientInfo updInfo = patientInfoList.get(0); - BeanUtils.copyBeanProp(updInfo, item); + String[] ignore = {"id"}; + BeanUtils.copyProperties(preHospitalization,updInfo, ignore); + updInfo.setVisitTime(preHospitalization.getRegistrationDate()); + updInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); patientInfoMapper.updatePatientInfo(updInfo); preHospitalization.setPatientId(patientInfoList.get(0).getId()); } else { PatientInfo saveInfo = new PatientInfo(); // 添加居民 - BeanUtils.copyBeanProp(saveInfo, item); + BeanUtils.copyProperties(preHospitalization, saveInfo); + saveInfo.setVisitTime(preHospitalization.getRegistrationDate()); + saveInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); patientInfoMapper.insertPatientInfo(saveInfo); preHospitalization.setPatientId(saveInfo.getId()); } // 根据患者身份证号和预约时间查询是否有记录 PatientPreHospitalization preHospitalizationQuery = new PatientPreHospitalization(); + preHospitalizationQuery.setHospitalAgencyId(preHospitalization.getHospitalAgencyId()); preHospitalizationQuery.setCardNo(item.getCardNo()); preHospitalizationQuery.setAppointmentDate(item.getAppointmentDate()); List list = preHospitalizationMapper.selectApplyList(preHospitalizationQuery); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java index 65c5ad8a..ffc2d8d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java @@ -39,6 +39,14 @@ public interface IPatientVisitRecordService { */ public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord); + /** + * 修改患者就诊记录基本信息 + * + * @param patientVisitRecord 患者就诊记录基本信息 + * @return 结果 + */ + public int updatePatientVisitRecord(PatientVisitRecord patientVisitRecord); + /** * 患者配置——就诊信息保存 * @param saveDto @@ -52,7 +60,7 @@ public interface IPatientVisitRecordService { * @param updDto 患者就诊记录基本信息 * @return 结果 */ - public int updatePatientVisitRecord(PatientVisitRecordSaveDto updDto); + public int updateRecord(PatientVisitRecordSaveDto updDto); /** * 批量删除患者就诊记录基本信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index c2382690..ee97c8f0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -2,8 +2,10 @@ package com.xinelu.manage.service.patientvisitrecord.impl; import com.xinelu.common.constant.Constants; import com.xinelu.common.constant.NodeTypeConstants; +import com.xinelu.common.constant.PatientTypeConstants; import com.xinelu.common.constant.VisitMethodConstants; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.enums.PatientSourceEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; @@ -22,6 +24,7 @@ import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; +import com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -32,6 +35,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 患者就诊记录基本信息Service业务层处理 @@ -51,6 +55,8 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService private AgencyMapper agencyMapper; @Resource private DepartmentMapper departmentMapper; + @Resource + private PatientInfoMapper patientInfoMapper; /** * 查询患者就诊记录基本信息 @@ -82,17 +88,58 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService */ @Override public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord) { + // 1、保存患者信息-查询是否有患者档案 + PatientInfoDto patientInfoDto = new PatientInfoDto(); + patientInfoDto.setHospitalAgencyId(patientVisitRecord.getHospitalAgencyId()); + patientInfoDto.setCardNo(patientInfoDto.getCardNo()); + List patientInfoList = patientInfoMapper.selectPatientInfoList(patientInfoDto); + // 患者档案信息新增/修改 + if(CollectionUtils.isEmpty(patientInfoList)) { + PatientInfo patientInfo = new PatientInfo(); + // 新增档案 + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + patientInfo.setPatientSource(PatientSourceEnum.MANAGE_END.name()); + patientInfo.setDelFlag(0); + setPatientType(patientInfo, patientVisitRecord); + patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientInfo.setCreateTime(LocalDateTime.now()); + patientInfoMapper.insertPatientInfo(patientInfo); + patientVisitRecord.setPatientId(patientInfo.getId()); + } else { + PatientInfo patientInfo = patientInfoList.get(0); + Long patientId = patientInfo.getId(); + // 修改档案 + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientInfo.setUpdateTime(LocalDateTime.now()); + patientInfo.setId(patientId); + setPatientType(patientInfo, patientVisitRecord); + patientInfoMapper.updatePatientInfo(patientInfo); + patientVisitRecord.setPatientId(patientId); + } patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); } - @Override + @Override + @Transactional + public int updatePatientVisitRecord(PatientVisitRecord patientVisitRecord) { + // 修改患者基本信息 + PatientInfo patientInfo = patientMapper.selectPatientInfoById(patientVisitRecord.getPatientId()); + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + setPatientType(patientInfo, patientVisitRecord); + patientMapper.updatePatientInfo(patientInfo); + // 修改就诊记录信息 + return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); + } + + @Override public int saveRecord(PatientVisitRecordSaveDto saveDto) { PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); - // 查询患者信息 - PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId()); - BeanUtils.copyBeanProp(patientVisitRecord, patientInfo); + // 查询患者基本信息 + PatientBaseInfoVo patientBaseInfo = patientMapper.getPatientBaseInfo(saveDto.getPatientId()); + BeanUtils.copyBeanProp(patientVisitRecord, patientBaseInfo); BeanUtils.copyBeanProp(patientVisitRecord, saveDto); patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); @@ -107,9 +154,10 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); if (flag > 0) { // 修改患者信息 - patientInfo.setVisitMethod(saveDto.getVisitMethod()); - patientInfo.setDepartmentId(saveDto.getDepartmentId()); - patientInfo.setDepartmentName(saveDto.getDepartmentName()); + PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId()); + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + patientInfo.setId(saveDto.getPatientId()); + setPatientType(patientInfo, patientVisitRecord); patientMapper.updatePatientInfo(patientInfo); } return flag; @@ -122,7 +170,8 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService * @return 结果 */ @Override - public int updatePatientVisitRecord(PatientVisitRecordSaveDto updDto) { + @Transactional + public int updateRecord(PatientVisitRecordSaveDto updDto) { if (updDto.getId() == null) { throw new ServiceException("数据传输错误"); } @@ -146,6 +195,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientInfo.setVisitMethod(updDto.getVisitMethod()); patientInfo.setDepartmentId(updDto.getDepartmentId()); patientInfo.setDepartmentName(updDto.getDepartmentName()); + setPatientType(patientInfo, patientVisitRecord); patientMapper.updatePatientInfo(patientInfo); } return flag; @@ -300,4 +350,27 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService } return AjaxResult.success(); } + + private void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { + + if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { + patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime()); + } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { + // 住院时间，出院时间-入院时间 + long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime()); + patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); + patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime()); + } + + if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { + // 住院患者：有出院时间，设置患者类型为出院，没有出院时间，设置患者类型为在院 + if (patientVisitRecord.getDischargeTime() == null) { + patientInfo.setPatientType(PatientTypeConstants.IN_HOSPITAL_PATIENT); + } else { + patientInfo.setPatientType(PatientTypeConstants.DISCHARGED_PATIENT); + } + } else if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { + patientInfo.setPatientType(PatientTypeConstants.OUTPATIENT); + } + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java new file mode 100644 index 00000000..3e6cf154 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java @@ -0,0 +1,51 @@ +package com.xinelu.manage.vo.patientinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; +import lombok.Data; + +/** + * @description: 患者基本信息 + * @author: haown + * @create: 2024-03-21 17:16 + **/ +@Data +public class PatientBaseInfoVo { + /** 主键id */ + private Long id; + + /** 患者姓名 */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名") + private String patientName; + + /** 患者电话 */ + @ApiModelProperty(value = "患者电话") + @Excel(name = "患者电话") + private String patientPhone; + + /** 家属电话 */ + @ApiModelProperty(value = "家属电话") + private String familyMemberPhone; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate birthDate; + + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** 性别，男：MALE，女：FEMALE */ + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + @Excel(name = "性别，男：MALE，女：FEMALE") + private String sex; + + /** 住址 */ + @ApiModelProperty(value = "住址") + @Excel(name = "住址") + private String address; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index 75538cf3..d8045c27 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -165,6 +165,13 @@ where id = #{id} + + insert into patient_info diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml index cad2d1c9..3dafb79e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml @@ -290,7 +290,7 @@ p.campus_agency_name, p.department_name,p.ward_name, p.appointment_treatment_group,p.registration_no,p.registration_date, - p.appointment_date,p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name + p.appointment_date, p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name, patient.create_time from patient_info patient left join patient_pre_hospitalization p on p.patient_id = patient.id p.del_flag = 0 and patient.patient_type = 'PRE_HOSPITALIZED_PATIENT' @@ -356,9 +356,9 @@ department_name,ward_id,ward_name, appointment_treatment_group,registration_no,registration_date, appointment_date,certificate_issuing_doctor_id,certificate_issuing_doctor_name, - responsible_nurse,del_flag,search_value, + responsible_nurse,del_flag, create_by,create_time,update_by, - update_time,remark,params) + update_time) values (#{item.id,jdbcType=NUMERIC},#{item.patientId,jdbcType=NUMERIC},#{item.patientName,jdbcType=VARCHAR}, @@ -369,9 +369,9 @@ #{item.departmentName,jdbcType=VARCHAR},#{item.wardId,jdbcType=NUMERIC},#{item.wardName,jdbcType=VARCHAR}, #{item.appointmentTreatmentGroup,jdbcType=VARCHAR},#{item.registrationNo,jdbcType=VARCHAR},#{item.registrationDate,jdbcType=TIMESTAMP}, #{item.appointmentDate,jdbcType=TIMESTAMP},#{item.certificateIssuingDoctorId,jdbcType=NUMERIC},#{item.certificateIssuingDoctorName,jdbcType=VARCHAR}, - #{item.responsibleNurse,jdbcType=VARCHAR},#{item.delFlag,jdbcType=NUMERIC},#{item.searchValue,jdbcType=VARCHAR}, + #{item.responsibleNurse,jdbcType=VARCHAR},#{item.delFlag,jdbcType=NUMERIC}, #{item.createBy,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP},#{item.updateBy,jdbcType=VARCHAR}, - #{item.updateTime,jdbcType=TIMESTAMP},#{item.remark,jdbcType=VARCHAR},#{item.params}) + #{item.updateTime,jdbcType=TIMESTAMP}) diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 602c3cf3..7f663ee5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -50,7 +50,7 @@ - select id, patient_id, card_no, patient_name, patient_phone, family_member_phone, address, sex, birth_date, age, nation, visit_type, visit_date, visit_name, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, attending_physician_id, attending_physician_name, main_diagnosis, marriage, medical_history_narrator, admission_time, discharge_time, record_time, outpatient_visit_info, hospitalization_days, in_hospital_info, out_hospital_info, visit_serial_number, in_hospital_number, responsible_nurse, surgical_name, create_by, create_time, update_by, update_time from patient_visit_record + select id, patient_id, card_no, patient_name, patient_phone, family_member_phone, address, sex, birth_date, age, nation, visit_method, visit_date, visit_name, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, attending_physician_id, attending_physician_name, main_diagnosis, marriage, medical_history_narrator, admission_time, discharge_time, record_time, outpatient_visit_info, hospitalization_days, in_hospital_info, out_hospital_info, visit_serial_number, in_hospital_number, responsible_nurse, surgical_name, create_by, create_time, update_by, update_time from patient_visit_record From a600e4d278421773fa4ba6a3de23f9739be5679e Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 22 Mar 2024 17:39:26 +0800 Subject: [PATCH 18/32] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signpatientmanageroutenode/SignPatientManageRouteNode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index c10a01cd..ab016ca7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -71,7 +71,7 @@ public class SignPatientManageRouteNode extends BaseEntity { /** 执行时间，格式：HH:mm */ @ApiModelProperty(value = "执行时间，格式：HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm") @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd") private LocalTime executeTime; From 706a7e3d3a61c2afa3870767e4afcc00ebc75205 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Mon, 25 Mar 2024 13:29:44 +0800 Subject: [PATCH 19/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientVisitRecordController.java | 10 +- .../domain/patientinfo/PatientInfo.java | 41 +++--- .../dto/patientinfo/PatientInfoDto.java | 5 +- .../PatientVisitRecordDto.java | 6 + .../PatientVisitRecordImportDto.java | 2 +- .../PatientVisitRecordInfoSaveDto.java | 123 ++++++++++++++++++ .../PatientVisitRecordSaveDto.java | 121 +++++++++++------ .../PatientVisitRecordMapper.java | 3 + .../PatientPreHospitalizationServiceImpl.java | 4 +- .../IPatientVisitRecordService.java | 7 +- .../impl/PatientVisitRecordServiceImpl.java | 97 +++++++++----- .../manage/patientinfo/PatientInfoMapper.xml | 93 ++++++------- .../PatientVisitRecordMapper.xml | 10 ++ 13 files changed, 359 insertions(+), 163 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 0e9f684c..d16fde95 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -11,6 +11,7 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordInfoSaveDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordSaveDto; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import io.swagger.annotations.Api; @@ -97,8 +98,9 @@ public class PatientVisitRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PatientVisitRecord patientVisitRecord) { - return toAjax(patientVisitRecordService.insertPatientVisitRecord(patientVisitRecord)); + public R add(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { + patientVisitRecordService.insertPatientVisitRecord(patientVisitRecord); + return R.ok(); } /** @@ -119,7 +121,7 @@ public class PatientVisitRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping("saveRecord") - public R saveRecord(@Valid @RequestBody PatientVisitRecordSaveDto saveDto) { + public R saveRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto saveDto) { patientVisitRecordService.saveRecord(saveDto); return R.ok(); } @@ -132,7 +134,7 @@ public class PatientVisitRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:visit:edit')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) @PutMapping("updateRecord") - public AjaxResult updateRecord(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { + public AjaxResult updateRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto patientVisitRecord) { return toAjax(patientVisitRecordService.updateRecord(patientVisitRecord)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index fafc73cf..0a76d65d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -89,25 +89,25 @@ public class PatientInfo extends BaseEntity { @Excel(name = "签约时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime signTime; - /** 开证医生（预住院患者） */ - @ApiModelProperty(value = "开证医生") - @Excel(name = "开证医生", readConverterExp = "预住院患者") - private String certificateIssuingDoctor; - /** 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") @Excel(name = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; + /** 主治医生id */ + @ApiModelProperty(value = "主治医生id") + @Excel(name = "主治医生id") + private Long attendingPhysicianId; + + /** 主治医生姓名 */ + @ApiModelProperty(value = "主治医生姓名") + @Excel(name = "主治医生姓名") + private String attendingPhysicianName; + /** 主要诊断 */ @ApiModelProperty(value = "主要诊断") private String mainDiagnosis; - /** 主治医生 */ - @ApiModelProperty(value = "主治医生") - @Excel(name = "主治医生") - private String attendingPhysician; - /** 所属医院id */ @ApiModelProperty(value = "所属医院id") private Long hospitalAgencyId; @@ -148,14 +148,14 @@ public class PatientInfo extends BaseEntity { @ApiModelProperty(value = "责任护士") private String responsibleNurse; + /** 最新一条就诊记录id */ + @ApiModelProperty(value = "最新一条就诊记录id") + private Long patientVisitRecordId; + /** 就诊流水号 */ @ApiModelProperty(value = "就诊流水号") private String visitSerialNumber; - /** 手术名称 */ - @ApiModelProperty(value = "手术名称") - private String surgicalName; - /** 入院时间，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间") private LocalDate admissionDate; @@ -164,10 +164,6 @@ public class PatientInfo extends BaseEntity { @ApiModelProperty(value = "出院时间（出院患者）") private LocalDate dischargeDate; - /** 病历内容 */ - @ApiModelProperty(value = "病历内容") - private String medicalRecordContent; - /** 预约治疗组（取值以及枚举未知？） */ @ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）") private String appointmentTreatmentGroup; @@ -189,10 +185,11 @@ public class PatientInfo extends BaseEntity { @Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ") private String inHospitalNumber; - /** 就诊时间（门诊患者），时间格式：yyyy-MM-dd */ - @ApiModelProperty(value = "就诊时间") - @Excel(name = "就诊时间", readConverterExp = "门=诊患者") - private LocalDate visitTime; + /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ + @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDateTime visitDate; /** 出院方式（出院患者） */ @ApiModelProperty(value = "出院方式") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index eceb2c28..184bac0e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -3,7 +3,6 @@ package com.xinelu.manage.dto.patientinfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; -import java.util.Date; import lombok.Data; /** @@ -52,8 +51,8 @@ public class PatientInfoDto { private String patientType; /** 主治医生 */ - @ApiModelProperty(value = "主治医生") - private String attendingPhysician; + @ApiModelProperty(value = "主治医生id") + private Long attendingPhysicianId; /** 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END */ @ApiModelProperty(value = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index f0db4e62..86b0de3a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.patientvisitrecord; +import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -17,6 +18,11 @@ public class PatientVisitRecordDto { @ApiModelProperty(value = "患者表id") private Long patientId; + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + @Excel(name = "所属医院id") + private Long hospitalAgencyId; + /** * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java index 2a7d57c5..61d061d0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java @@ -82,7 +82,7 @@ public class PatientVisitRecordImportDto { /** 主治医生 */ @ApiModelProperty(value = "主治医生") @Excel(name = "主治医生") - private String attendingPhysician; + private String attendingPhysicianName; @ApiModelProperty(value = "住院/门诊号") @Excel(name = "住院号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java new file mode 100644 index 00000000..b2e04d0b --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java @@ -0,0 +1,123 @@ +package com.xinelu.manage.dto.patientvisitrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * @description: 患者配置——就诊信息保存传输对象 + * @author: haown + * @create: 2024-03-13 14:46 + **/ +@ApiModel("患者配置——就诊信息保存传输对象") +@Data +public class PatientVisitRecordInfoSaveDto { + + /** 就诊信息表id */ + @ApiModelProperty(value = "就诊信息表id") + private Long id; + + /** 患者表id */ + @ApiModelProperty(value = "患者表id") + @NotNull(message = "患者数据不能为空") + private Long patientId; + + /** + * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED + */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + @NotNull(message = "就诊类型不能为空") + private String visitMethod; + + /** 主要诊断 */ + @ApiModelProperty(value = "主要诊断") + @NotNull(message = "主要诊断不能为空") + private String mainDiagnosis; + + /** 就诊流水号 */ + @ApiModelProperty(value = "就诊流水号") + @NotNull(message = "就诊流水号不能为空") + private String visitSerialNumber; + + /** 主治医生id */ + @ApiModelProperty(value = "主治医生id") + @NotNull(message = "主治医生不能为空") + private Long attendingPhysicianId; + + /** 主治医生姓名 */ + @ApiModelProperty(value = "主治医生姓名") + private String attendingPhysicianName; + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + @Excel(name = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + @Excel(name = "所属医院名称") + private String hospitalAgencyName; + + /** 所属院区id */ + @ApiModelProperty(value = "所属院区id") + @Excel(name = "所属院区id") + private Long campusAgencyId; + + /** 所属院区名称 */ + @ApiModelProperty(value = "所属院区名称") + @Excel(name = "所属院区名称") + private String campusAgencyName; + + /** 所属科室id */ + @NotNull(message = "科室不能为空") + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + private String departmentName; + + /** 所属病区id */ + @ApiModelProperty(value = "所属病区id") + @Excel(name = "所属病区id") + private Long wardId; + + /** 所属病区名称 */ + @ApiModelProperty(value = "所属病区名称") + @Excel(name = "所属病区名称") + private String wardName; + + /** 入院时间 */ + @ApiModelProperty(value = "入院时间") + @NotNull(message = "入院时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime admissionTime; + + /** 出院时间 */ + @ApiModelProperty(value = "出院时间") + @NotNull(message = "出院时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dischargeTime; + + @ApiModelProperty(value = "住院/门诊号") + private String inHospitalNumber; + + /** 入院病历信息，存储患者入院的整个病历信息 */ + @ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息") + @NotNull(message = "入院病历不能为空") + private String inHospitalInfo; + + /** 出院病历信息，存储患者出院的整个病历信息 */ + @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") + private String outHospitalInfo; + + /** 手术名称 */ + @ApiModelProperty(value = "手术名称") + @Excel(name = "手术名称") + private String surgicalName; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index 3cd1473e..c1c62135 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -2,78 +2,86 @@ package com.xinelu.manage.dto.patientvisitrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; import java.time.LocalDateTime; import javax.validation.constraints.NotNull; import lombok.Data; /** - * @description: 患者配置——就诊信息保存传输对象 + * @description: 就诊记录保存传输对象 * @author: haown - * @create: 2024-03-13 14:46 + * @create: 2024-03-25 09:43 **/ -@ApiModel("患者配置——就诊信息保存传输对象") @Data public class PatientVisitRecordSaveDto { - /** 就诊信息表id */ - @ApiModelProperty(value = "就诊信息表id") + /** 主键Id */ private Long id; /** 患者表id */ @ApiModelProperty(value = "患者表id") - @NotNull(message = "患者数据不能为空") private Long patientId; - /** - * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED - */ + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + @NotNull(message = "身份证号不能为空") + private String cardNo; + + /** 姓名 */ + @ApiModelProperty(value = "姓名") + private String patientName; + + /** 患者电话 */ + @ApiModelProperty(value = "患者电话") + private String patientPhone; + + /** 家属电话 */ + @ApiModelProperty(value = "家属电话") + private String familyMemberPhone; + + /** 地址 */ + @ApiModelProperty(value = "地址") + private String address; + + /** 性别，男：MALE，女：FEMALE */ + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + private String sex; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate birthDate; + + /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") @NotNull(message = "就诊类型不能为空") private String visitMethod; - /** 主要诊断 */ - @ApiModelProperty(value = "主要诊断") - @NotNull(message = "主要诊断不能为空") - private String mainDiagnosis; - - /** 就诊流水号 */ - @ApiModelProperty(value = "就诊流水号") - @NotNull(message = "就诊流水号不能为空") - private String visitSerialNumber; - - /** 主治医生id */ - @ApiModelProperty(value = "主治医生id") - @NotNull(message = "主治医生不能为空") - private Long attendingPhysicianId; - - /** 主治医生姓名 */ - @ApiModelProperty(value = "主治医生姓名") - private String attendingPhysicianName; + /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ + @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime visitDate; /** 所属医院id */ @ApiModelProperty(value = "所属医院id") - @Excel(name = "所属医院id") + @NotNull(message = "所属医院不能为空") private Long hospitalAgencyId; /** 所属医院名称 */ @ApiModelProperty(value = "所属医院名称") - @Excel(name = "所属医院名称") + @NotNull(message = "所属医院不能为空") private String hospitalAgencyName; /** 所属院区id */ @ApiModelProperty(value = "所属院区id") - @Excel(name = "所属院区id") private Long campusAgencyId; /** 所属院区名称 */ @ApiModelProperty(value = "所属院区名称") - @Excel(name = "所属院区名称") private String campusAgencyName; /** 所属科室id */ - @NotNull(message = "科室不能为空") @ApiModelProperty(value = "所属科室id") private Long departmentId; @@ -83,41 +91,72 @@ public class PatientVisitRecordSaveDto { /** 所属病区id */ @ApiModelProperty(value = "所属病区id") - @Excel(name = "所属病区id") private Long wardId; /** 所属病区名称 */ @ApiModelProperty(value = "所属病区名称") - @Excel(name = "所属病区名称") private String wardName; + /** 主治医生id */ + @ApiModelProperty(value = "主治医生id") + private Long attendingPhysicianId; + + /** 主治医生姓名 */ + @ApiModelProperty(value = "主治医生姓名") + private String attendingPhysicianName; + + /** 主要诊断 */ + @ApiModelProperty(value = "主要诊断") + private String mainDiagnosis; + /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @NotNull(message = "入院时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @NotNull(message = "出院时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime dischargeTime; - @ApiModelProperty(value = "住院/门诊号") - private String inHospitalNumber; + /** _记录时间（入院记录） */ + @ApiModelProperty(value = "_记录时间") + @Excel(name = "_记录时间", readConverterExp = "入=院记录") + private LocalDateTime recordTime; + + /** 住院天数（出院记录），单位为：天 */ + @ApiModelProperty(value = "住院天数") + @Excel(name = "住院天数", readConverterExp = "出=院记录") + private Integer hospitalizationDays; /** 入院病历信息，存储患者入院的整个病历信息 */ @ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息") - @NotNull(message = "入院病历不能为空") private String inHospitalInfo; /** 出院病历信息，存储患者出院的整个病历信息 */ @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") private String outHospitalInfo; + /** 就诊流水号 */ + @ApiModelProperty(value = "就诊流水号") + private String visitSerialNumber; + + /** 门诊/住院号 */ + @ApiModelProperty(value = "门诊/住院号") + @NotNull(message = "门诊/住院号不能为空") + private String inHospitalNumber; + + /** 责任护士 */ + @ApiModelProperty(value = "责任护士") + private String responsibleNurse; + /** 手术名称 */ @ApiModelProperty(value = "手术名称") - @Excel(name = "手术名称") private String surgicalName; + /** 患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT， + 签约患者：CONTRACTED_PATIENT */ + @ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT") + @NotNull(message = "患者类型不能为空") + private String patientType; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java index 3a1ffea2..4487cd1e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java @@ -61,4 +61,7 @@ public interface PatientVisitRecordMapper { * @return 结果 */ public int deletePatientVisitRecordByIds(Long[] ids); + + PatientVisitRecord judgeRepeat(@Param("hospitalAgencyId") Long hospitalAgencyId, @Param("cardNo") String cardNo, + @Param("inHospitalNumber") String inHospitalNumber); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index f2379c6a..ec91d84a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -190,7 +190,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital PatientInfo updInfo = patientInfoList.get(0); String[] ignore = {"id"}; BeanUtils.copyProperties(preHospitalization,updInfo, ignore); - updInfo.setVisitTime(preHospitalization.getRegistrationDate()); + updInfo.setVisitDate(preHospitalization.getRegistrationDate().atStartOfDay()); updInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); patientInfoMapper.updatePatientInfo(updInfo); preHospitalization.setPatientId(patientInfoList.get(0).getId()); @@ -198,7 +198,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital PatientInfo saveInfo = new PatientInfo(); // 添加居民 BeanUtils.copyProperties(preHospitalization, saveInfo); - saveInfo.setVisitTime(preHospitalization.getRegistrationDate()); + saveInfo.setVisitDate(preHospitalization.getRegistrationDate().atStartOfDay()); saveInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); patientInfoMapper.insertPatientInfo(saveInfo); preHospitalization.setPatientId(saveInfo.getId()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java index ffc2d8d4..29c0f088 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java @@ -4,6 +4,7 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordInfoSaveDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordSaveDto; import java.util.List; import org.springframework.web.bind.annotation.RequestBody; @@ -37,7 +38,7 @@ public interface IPatientVisitRecordService { * @param patientVisitRecord 患者就诊记录基本信息 * @return 结果 */ - public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord); + public void insertPatientVisitRecord(PatientVisitRecordSaveDto patientVisitRecord); /** * 修改患者就诊记录基本信息 @@ -52,7 +53,7 @@ public interface IPatientVisitRecordService { * @param saveDto * @return */ - int saveRecord(@RequestBody PatientVisitRecordSaveDto saveDto); + int saveRecord(@RequestBody PatientVisitRecordInfoSaveDto saveDto); /** * 修改患者就诊记录基本信息 @@ -60,7 +61,7 @@ public interface IPatientVisitRecordService { * @param updDto 患者就诊记录基本信息 * @return 结果 */ - public int updateRecord(PatientVisitRecordSaveDto updDto); + public int updateRecord(PatientVisitRecordInfoSaveDto updDto); /** * 批量删除患者就诊记录基本信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index ee97c8f0..23fe1cc9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -18,6 +18,7 @@ import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordInfoSaveDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordSaveDto; import com.xinelu.manage.mapper.agency.AgencyMapper; import com.xinelu.manage.mapper.department.DepartmentMapper; @@ -83,81 +84,115 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService /** * 新增患者就诊记录基本信息 * - * @param patientVisitRecord 患者就诊记录基本信息 + * @param saveDto 患者就诊记录基本信息 * @return 结果 */ @Override - public int insertPatientVisitRecord(PatientVisitRecord patientVisitRecord) { + @Transactional(rollbackFor = Exception.class) + public void insertPatientVisitRecord(PatientVisitRecordSaveDto saveDto) { + // 根据机构id、患者身份证号判断门诊/住院号是否重复 + PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), saveDto.getCardNo(), saveDto.getInHospitalNumber()); + if (ObjectUtils.isNotEmpty(patientVisitRecord)) { + throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); + } + PatientVisitRecord saveBody = new PatientVisitRecord(); + BeanUtils.copyBeanProp(saveBody, saveDto); + setVisitDate(saveBody); // 1、保存患者信息-查询是否有患者档案 PatientInfoDto patientInfoDto = new PatientInfoDto(); - patientInfoDto.setHospitalAgencyId(patientVisitRecord.getHospitalAgencyId()); + patientInfoDto.setHospitalAgencyId(saveBody.getHospitalAgencyId()); patientInfoDto.setCardNo(patientInfoDto.getCardNo()); List patientInfoList = patientInfoMapper.selectPatientInfoList(patientInfoDto); // 患者档案信息新增/修改 + PatientInfo patientInfo = new PatientInfo(); if(CollectionUtils.isEmpty(patientInfoList)) { - PatientInfo patientInfo = new PatientInfo(); // 新增档案 BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); patientInfo.setPatientSource(PatientSourceEnum.MANAGE_END.name()); patientInfo.setDelFlag(0); - setPatientType(patientInfo, patientVisitRecord); patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setCreateTime(LocalDateTime.now()); patientInfoMapper.insertPatientInfo(patientInfo); - patientVisitRecord.setPatientId(patientInfo.getId()); + saveBody.setPatientId(patientInfo.getId()); } else { - PatientInfo patientInfo = patientInfoList.get(0); + patientInfo = patientInfoList.get(0); Long patientId = patientInfo.getId(); // 修改档案 BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setUpdateTime(LocalDateTime.now()); patientInfo.setId(patientId); - setPatientType(patientInfo, patientVisitRecord); patientInfoMapper.updatePatientInfo(patientInfo); - patientVisitRecord.setPatientId(patientId); + saveBody.setPatientId(patientId); } - patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientVisitRecord.setCreateTime(LocalDateTime.now()); - return patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); + // 保存/修改就诊记录 + Long recordId = saveOrUpate(saveBody); + // 修改患者最近一次就诊记录id + patientInfo.setPatientVisitRecordId(recordId); + patientInfo.setVisitDate(saveBody.getVisitDate()); + patientInfoMapper.updatePatientInfo(patientInfo); } + private Long saveOrUpate(PatientVisitRecord patientVisitRecord) { + PatientVisitRecordDto query = new PatientVisitRecordDto(); + query.setHospitalAgencyId(patientVisitRecord.getHospitalAgencyId()); + query.setInHospitalNumber(patientVisitRecord.getInHospitalNumber()); + List patientVisitRecordList = patientVisitRecordMapper.selectPatientVisitRecordList(query); + if (CollectionUtils.isEmpty(patientVisitRecordList)) { + patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientVisitRecord.setCreateTime(LocalDateTime.now()); + patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); + } else { + patientVisitRecord.setId(patientVisitRecordList.get(0).getId()); + patientVisitRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientVisitRecord.setUpdateTime(LocalDateTime.now()); + patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); + } + return patientVisitRecord.getId(); + } + @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updatePatientVisitRecord(PatientVisitRecord patientVisitRecord) { + // 根据机构id、患者身份证号判断门诊/住院号是否重复 + PatientVisitRecord object = patientVisitRecordMapper.judgeRepeat(patientVisitRecord.getHospitalAgencyId(), patientVisitRecord.getCardNo(), patientVisitRecord.getInHospitalNumber()); + if (ObjectUtils.isNotEmpty(object)) { + throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); + } // 修改患者基本信息 PatientInfo patientInfo = patientMapper.selectPatientInfoById(patientVisitRecord.getPatientId()); + setVisitDate(patientVisitRecord); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); - setPatientType(patientInfo, patientVisitRecord); patientMapper.updatePatientInfo(patientInfo); // 修改就诊记录信息 return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); } @Override - public int saveRecord(PatientVisitRecordSaveDto saveDto) { + @Transactional(rollbackFor = Exception.class) + public int saveRecord(PatientVisitRecordInfoSaveDto saveDto) { PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); // 查询患者基本信息 PatientBaseInfoVo patientBaseInfo = patientMapper.getPatientBaseInfo(saveDto.getPatientId()); BeanUtils.copyBeanProp(patientVisitRecord, patientBaseInfo); + // 根据机构id、患者身份证号判断门诊/住院号是否重复 + PatientVisitRecord object = patientVisitRecordMapper.judgeRepeat(patientVisitRecord.getHospitalAgencyId(), patientVisitRecord.getCardNo(), patientVisitRecord.getInHospitalNumber()); + if (ObjectUtils.isNotEmpty(object)) { + throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); + } BeanUtils.copyBeanProp(patientVisitRecord, saveDto); patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); - // 住院时间，出院时间-入院时间 - long daysBetween = ChronoUnit.DAYS.between(saveDto.getAdmissionTime(), saveDto.getDischargeTime()); - patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, saveDto.getVisitMethod())) { - patientVisitRecord.setVisitDate(saveDto.getDischargeTime()); - } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, saveDto.getVisitMethod())) { - patientVisitRecord.setVisitDate(saveDto.getAdmissionTime()); - } + setVisitDate(patientVisitRecord); int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); if (flag > 0) { // 修改患者信息 PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId()); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); patientInfo.setId(saveDto.getPatientId()); + // 设置患者类型 setPatientType(patientInfo, patientVisitRecord); + patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); patientMapper.updatePatientInfo(patientInfo); } return flag; @@ -171,7 +206,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService */ @Override @Transactional - public int updateRecord(PatientVisitRecordSaveDto updDto) { + public int updateRecord(PatientVisitRecordInfoSaveDto updDto) { if (updDto.getId() == null) { throw new ServiceException("数据传输错误"); } @@ -180,13 +215,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientVisitRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setUpdateTime(LocalDateTime.now()); // 住院时间，出院时间-入院时间 - long daysBetween = ChronoUnit.DAYS.between(updDto.getAdmissionTime(), updDto.getDischargeTime()); - patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, updDto.getVisitMethod())) { - patientVisitRecord.setVisitDate(updDto.getDischargeTime()); - } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, updDto.getVisitMethod())) { - patientVisitRecord.setVisitDate(updDto.getAdmissionTime()); - } + setVisitDate(patientVisitRecord); int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); if (flag > 0) { // 查询患者信息 @@ -201,6 +230,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService return flag; } + /** * 批量删除患者就诊记录基本信息 * @@ -351,8 +381,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService return AjaxResult.success(); } - private void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { - + private void setVisitDate(PatientVisitRecord patientVisitRecord) { if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime()); } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { @@ -361,7 +390,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime()); } + } + private void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { // 住院患者：有出院时间，设置患者类型为出院，没有出院时间，设置患者类型为在院 if (patientVisitRecord.getDischargeTime() == null) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index d8045c27..1f1d1326 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -17,10 +17,10 @@ - + + - @@ -30,17 +30,16 @@ + - - - + @@ -64,11 +63,11 @@ patient_type, sign_status, sign_time, - certificate_issuing_doctor, visit_method, main_diagnosis, attending_physician, + visit_method, attending_physician_id, attending_physician_name, main_diagnosis, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, - responsible_nurse, visit_serial_number, surgical_name, - admission_date, discharge_date, medical_record_content, appointment_treatment_group, - registration_no, registration_date, appointment_date, in_hospital_number, visit_time, discharge_method, + responsible_nurse, patient_visit_record_id, visit_serial_number, + admission_date, discharge_date, appointment_treatment_group, + registration_no, registration_date, appointment_date, in_hospital_number, visit_date, discharge_method, open_id, union_id, patient_source, del_flag, create_by, create_time, update_by, update_time from patient_info @@ -96,6 +95,9 @@ + + and attending_physician_id = #{attendingPhysicianId} + and main_diagnosis like concat('%', #{mainDiagnosis}, '%') @@ -111,21 +113,14 @@ and ward_id = #{wardId} - - and attending_physician = #{attendingPhysician} - and visit_method = #{visitMethod} - - - and surgical_name like concat('%', #{surgicalName}, '%') - - and visit_time >= #{visitTimeStart} + and visit_date >= #{visitTimeStart} - and visit_time <= #{visitTimeEnd} + and visit_date <= #{visitTimeEnd} and admission_date >= #{admissionDateStart} @@ -142,9 +137,6 @@ and appointment_treatment_group = #{appointmentTreatmentGroup} - - and certificate_issuing_doctor = #{certificateIssuingDoctor} - and registration_no = #{registrationNo} @@ -200,13 +192,13 @@ sign_time, - certificate_issuing_doctor, - visit_method, - main_diagnosis, + attending_physician_id, - attending_physician, + attending_physician_name, + + main_diagnosis, hospital_agency_id, @@ -227,11 +219,11 @@ responsible_nurse, + + patient_visit_record_id, + visit_serial_number, - - - surgical_name, admission_date, @@ -239,8 +231,6 @@ discharge_date, - medical_record_content, - appointment_treatment_group, registration_no, @@ -251,7 +241,7 @@ in_hospital_number, - visit_time, + visit_date, discharge_method, @@ -297,13 +287,13 @@ #{signTime}, - #{certificateIssuingDoctor}, - #{visitMethod}, - #{mainDiagnosis}, + #{attendingPhysicianId}, - #{attendingPhysician}, + #{attendingPhysicianName}, + + #{mainDiagnosis}, #{hospitalAgencyId}, @@ -323,16 +313,14 @@ #{responsibleNurse}, - #{visitSerialNumber}, + #{patientVisitRecordId}, - #{surgicalName}, + #{visitSerialNumber}, #{admissionDate}, #{dischargeDate}, - #{medicalRecordContent}, - #{appointmentTreatmentGroup}, #{registrationNo}, @@ -343,7 +331,7 @@ #{inHospitalNumber}, - #{visitTime}, + #{visitDate}, #{dischargeMethod}, @@ -403,18 +391,18 @@ sign_time = #{signTime}, - certificate_issuing_doctor = - #{certificateIssuingDoctor}, - visit_method = #{visitMethod}, + attending_physician_id = + #{attendingPhysicianId}, + + attending_physician_name = + #{attendingPhysicianName}, + main_diagnosis = #{mainDiagnosis}, - attending_physician = - #{attendingPhysician}, - hospital_agency_id = #{hospitalAgencyId}, @@ -442,21 +430,18 @@ responsible_nurse = #{responsibleNurse}, + patient_visit_record_id = + #{patientVisitRecordId}, + visit_serial_number = #{visitSerialNumber}, - surgical_name = - #{surgicalName}, - admission_date = #{admissionDate}, discharge_date = #{dischargeDate}, - medical_record_content = - #{medicalRecordContent}, - appointment_treatment_group = #{appointmentTreatmentGroup}, @@ -472,8 +457,8 @@ in_hospital_number = #{inHospitalNumber}, - visit_time = - #{visitTime}, + visit_date = + #{visitDate}, discharge_method = #{dischargeMethod}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 7f663ee5..01094470 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -59,6 +59,9 @@ and patient_id = #{patientId} + + and hospital_agency_id = #{hospitalAgencyId} + and visit_method = #{visitMethod} @@ -428,4 +431,11 @@ #{item.updateTime,jdbcType=TIMESTAMP},#{item.remark,jdbcType=VARCHAR}) + \ No newline at end of file From bdc1b53cb24011204b67f24c3c584ffd01cfa6fd Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 25 Mar 2024 17:24:07 +0800 Subject: [PATCH 20/32] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientTaskExecuteRecordController.java | 79 +++++ .../SpecialDiseaseNodeController.java | 7 +- ...cialDiseaseTriggerConditionController.java | 13 + .../PatientTaskExecuteRecord.java | 137 +++++++++ .../PatientTaskExecuteRecordMapper.java | 70 +++++ .../SpecialDiseaseNodeMapper.java | 14 +- .../IPatientTaskExecuteRecordService.java | 62 ++++ .../PatientTaskExecuteRecordServiceImpl.java | 91 ++++++ .../ISpecialDiseaseNodeService.java | 13 +- .../impl/SpecialDiseaseNodeServiceImpl.java | 11 +- .../PatientTaskExecuteRecordVO.java | 156 ++++++++++ .../PatientTaskExecuteRecordMapper.xml | 283 ++++++++++++++++++ .../SpecialDiseaseNodeMapper.xml | 93 ++++++ 13 files changed, 1011 insertions(+), 18 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java new file mode 100644 index 00000000..57ab0956 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java @@ -0,0 +1,79 @@ +package com.xinelu.manage.controller.patienttaskexecuterecord; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService; +import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 患者管理任务执行记录Controller + * + * @author xinelu + * @date 2024-03-25 + */ +@RestController +@RequestMapping("/system/taskExecuteRecord") +public class PatientTaskExecuteRecordController extends BaseController { + @Resource + private IPatientTaskExecuteRecordService patientTaskExecuteRecordService; + + /** + * 查询患者管理任务执行记录列表 + */ + @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:list')") + @GetMapping("/list") + public TableDataInfo list(PatientTaskExecuteRecordVO patientTaskExecuteRecord) { + startPage(); + List list = patientTaskExecuteRecordService.selectPatientTaskExecuteRecordList(patientTaskExecuteRecord); + return getDataTable(list); + } + + /** + * 获取患者管理任务执行记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientTaskExecuteRecordService.selectPatientTaskExecuteRecordById(id)); + } + + /** + * 新增患者管理任务执行记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:add')") + @Log(title = "患者管理任务执行记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PatientTaskExecuteRecord patientTaskExecuteRecord) { + return toAjax(patientTaskExecuteRecordService.insertPatientTaskExecuteRecord(patientTaskExecuteRecord)); + } + + /** + * 修改患者管理任务执行记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:edit')") + @Log(title = "患者管理任务执行记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PatientTaskExecuteRecord patientTaskExecuteRecord) { + return toAjax(patientTaskExecuteRecordService.updatePatientTaskExecuteRecord(patientTaskExecuteRecord)); + } + + /** + * 删除患者管理任务执行记录 + */ + @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:remove')") + @Log(title = "患者管理任务执行记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientTaskExecuteRecordService.deletePatientTaskExecuteRecordByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java index ce3bc1a0..257829b3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java @@ -7,6 +7,7 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -64,8 +65,8 @@ public class SpecialDiseaseNodeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:add')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SpecialDiseaseNode specialDiseaseNode) { + @PostMapping("/add") + public AjaxResult add(@RequestBody SpecialDiseaseNodeDTO specialDiseaseNode) { return toAjax(specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode)); } @@ -74,7 +75,7 @@ public class SpecialDiseaseNodeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:edit')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody SpecialDiseaseNode specialDiseaseNode) { return toAjax(specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java index 2a09634a..4be8d296 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java @@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 触发条件关系Controller @@ -39,6 +41,17 @@ public class SpecialDiseaseTriggerConditionController extends BaseController { return getDataTable(list); } + /** + * 查询触发条件关系列表 + */ + @GetMapping("/triggerConditionList") + public AjaxResult triggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { + if (Objects.isNull(specialDiseaseTriggerCondition) || Objects.isNull(specialDiseaseTriggerCondition.getRouteId())) { + return AjaxResult.success(new ArrayList<>()); + } + return AjaxResult.success(specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition)); + } + /** * 导出触发条件关系列表 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java new file mode 100644 index 00000000..1db99cc0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java @@ -0,0 +1,137 @@ +package com.xinelu.manage.domain.patienttaskexecuterecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + + +/** + * 患者管理任务执行记录对象 patient_task_execute_record + * + * @author xinelu + * @date 2024-03-25 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者管理任务执行记录对象", description = "patient_task_execute_record") +public class PatientTaskExecuteRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 患者表id + */ + @ApiModelProperty(value = "患者表id") + @Excel(name = "患者表id") + private Long patientId; + + /** + * 签约患者管理任务表id + */ + @ApiModelProperty(value = "签约患者管理任务表id") + @Excel(name = "签约患者管理任务表id") + private Long manageRouteId; + + /** + * 签约患者管理任务节点表id + */ + @ApiModelProperty(value = "签约患者管理任务节点表id") + @Excel(name = "签约患者管理任务节点表id") + private Long manageRouteNodeId; + + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名") + private String patientName; + + /** + * 签约患者管理任务名称 + */ + @ApiModelProperty(value = "签约患者管理任务名称") + @Excel(name = "签约患者管理任务名称") + private String manageRouteName; + + /** + * 签约患者管理路径节点名称 + */ + @ApiModelProperty(value = "签约患者管理路径节点名称") + @Excel(name = "签约患者管理路径节点名称") + private String manageRouteNodeName; + + /** + * 任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP + */ + @ApiModelProperty(value = "任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP") + @Excel(name = "任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP") + private String taskContent; + + /** + * 任务执行时间，格式：yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "任务执行时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "任务执行时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") + private Date executeTime; + + /** + * 执行人姓名，手动执行时记录 + */ + @ApiModelProperty(value = "执行人姓名，手动执行时记录") + @Excel(name = "执行人姓名，手动执行时记录") + private String executePerson; + + /** + * 任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE + */ + @ApiModelProperty(value = "任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE") + @Excel(name = "任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE") + private String executeType; + + /** + * 备注信息 + */ + @ApiModelProperty(value = "备注信息") + @Excel(name = "备注信息") + private String executeRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("patientId", getPatientId()) + .append("manageRouteId", getManageRouteId()) + .append("manageRouteNodeId", getManageRouteNodeId()) + .append("patientName", getPatientName()) + .append("manageRouteName", getManageRouteName()) + .append("manageRouteNodeName", getManageRouteNodeName()) + .append("taskContent", getTaskContent()) + .append("executeTime", getExecuteTime()) + .append("executePerson", getExecutePerson()) + .append("executeType", getExecuteType()) + .append("executeRemark", getExecuteRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java new file mode 100644 index 00000000..c5d1cbb2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java @@ -0,0 +1,70 @@ +package com.xinelu.manage.mapper.patienttaskexecuterecord; + +import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; + +import java.util.List; + +/** + * 患者管理任务执行记录Mapper接口 + * + * @author xinelu + * @date 2024-03-25 + */ +public interface PatientTaskExecuteRecordMapper { + /** + * 查询患者管理任务执行记录 + * + * @param id 患者管理任务执行记录主键 + * @return 患者管理任务执行记录 + */ + PatientTaskExecuteRecord selectPatientTaskExecuteRecordById(Long id); + + /** + * 查询患者管理任务执行记录列表 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 患者管理任务执行记录集合 + */ + List selectPatientTaskExecuteRecordList(PatientTaskExecuteRecord patientTaskExecuteRecord); + + /** + * 查询患者管理任务执行记录列表 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 患者管理任务执行记录集合 + */ + List selectPatientAndExecuteRecordList(PatientTaskExecuteRecordVO patientTaskExecuteRecord); + + /** + * 新增患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + int insertPatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord); + + /** + * 修改患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + int updatePatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord); + + /** + * 删除患者管理任务执行记录 + * + * @param id 患者管理任务执行记录主键 + * @return 结果 + */ + int deletePatientTaskExecuteRecordById(Long id); + + /** + * 批量删除患者管理任务执行记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deletePatientTaskExecuteRecordByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index a06e1182..5f78c086 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -18,7 +18,7 @@ public interface SpecialDiseaseNodeMapper { * @param id 专病路径-管理节点信息主键 * @return 专病路径-管理节点信息 */ - public SpecialDiseaseNode selectSpecialDiseaseNodeById(Long id); + SpecialDiseaseNode selectSpecialDiseaseNodeById(Long id); /** * 查询专病路径-管理节点信息列表 @@ -26,7 +26,7 @@ public interface SpecialDiseaseNodeMapper { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 专病路径-管理节点信息集合 */ - public List selectSpecialDiseaseNodeList(SpecialDiseaseNode specialDiseaseNode); + List selectSpecialDiseaseNodeList(SpecialDiseaseNode specialDiseaseNode); /** * 新增专病路径-管理节点信息 @@ -34,7 +34,7 @@ public interface SpecialDiseaseNodeMapper { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - public int insertSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); + int insertSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); /** * 修改专病路径-管理节点信息 @@ -42,7 +42,7 @@ public interface SpecialDiseaseNodeMapper { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - public int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); + int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); /** * 删除专病路径-管理节点信息 @@ -50,7 +50,7 @@ public interface SpecialDiseaseNodeMapper { * @param id 专病路径-管理节点信息主键 * @return 结果 */ - public int deleteSpecialDiseaseNodeById(Long id); + int deleteSpecialDiseaseNodeById(Long id); /** * 批量删除专病路径-管理节点信息 @@ -58,5 +58,7 @@ public interface SpecialDiseaseNodeMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteSpecialDiseaseNodeByIds(Long[] ids); + int deleteSpecialDiseaseNodeByIds(Long[] ids); + + int insertSpecialDiseaseNodeList(List specialDiseaseNodeList); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java new file mode 100644 index 00000000..b3d41ea2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java @@ -0,0 +1,62 @@ +package com.xinelu.manage.service.patienttaskexecuterecord; + +import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; + +import java.util.List; + +/** + * 患者管理任务执行记录Service接口 + * + * @author xinelu + * @date 2024-03-25 + */ +public interface IPatientTaskExecuteRecordService { + /** + * 查询患者管理任务执行记录 + * + * @param id 患者管理任务执行记录主键 + * @return 患者管理任务执行记录 + */ + PatientTaskExecuteRecord selectPatientTaskExecuteRecordById(Long id); + + /** + * 查询患者管理任务执行记录列表 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 患者管理任务执行记录集合 + */ + List selectPatientTaskExecuteRecordList(PatientTaskExecuteRecordVO patientTaskExecuteRecord); + + /** + * 新增患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + int insertPatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord); + + /** + * 修改患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + int updatePatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord); + + /** + * 批量删除患者管理任务执行记录 + * + * @param ids 需要删除的患者管理任务执行记录主键集合 + * @return 结果 + */ + int deletePatientTaskExecuteRecordByIds(Long[] ids); + + /** + * 删除患者管理任务执行记录信息 + * + * @param id 患者管理任务执行记录主键 + * @return 结果 + */ + int deletePatientTaskExecuteRecordById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java new file mode 100644 index 00000000..cb7baeb8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.service.patienttaskexecuterecord.impl; + +import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecordMapper; +import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService; +import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 患者管理任务执行记录Service业务层处理 + * + * @author xinelu + * @date 2024-03-25 + */ +@Service +public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteRecordService { + @Resource + private PatientTaskExecuteRecordMapper patientTaskExecuteRecordMapper; + + /** + * 查询患者管理任务执行记录 + * + * @param id 患者管理任务执行记录主键 + * @return 患者管理任务执行记录 + */ + @Override + public PatientTaskExecuteRecord selectPatientTaskExecuteRecordById(Long id) { + return patientTaskExecuteRecordMapper.selectPatientTaskExecuteRecordById(id); + } + + /** + * 查询患者管理任务执行记录列表 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 患者管理任务执行记录 + */ + @Override + public List selectPatientTaskExecuteRecordList(PatientTaskExecuteRecordVO patientTaskExecuteRecord) { + return patientTaskExecuteRecordMapper.selectPatientAndExecuteRecordList(patientTaskExecuteRecord); + } + + /** + * 新增患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + @Override + public int insertPatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord) { + patientTaskExecuteRecord.setCreateTime(LocalDateTime.now()); + return patientTaskExecuteRecordMapper.insertPatientTaskExecuteRecord(patientTaskExecuteRecord); + } + + /** + * 修改患者管理任务执行记录 + * + * @param patientTaskExecuteRecord 患者管理任务执行记录 + * @return 结果 + */ + @Override + public int updatePatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord) { + patientTaskExecuteRecord.setUpdateTime(LocalDateTime.now()); + return patientTaskExecuteRecordMapper.updatePatientTaskExecuteRecord(patientTaskExecuteRecord); + } + + /** + * 批量删除患者管理任务执行记录 + * + * @param ids 需要删除的患者管理任务执行记录主键 + * @return 结果 + */ + @Override + public int deletePatientTaskExecuteRecordByIds(Long[] ids) { + return patientTaskExecuteRecordMapper.deletePatientTaskExecuteRecordByIds(ids); + } + + /** + * 删除患者管理任务执行记录信息 + * + * @param id 患者管理任务执行记录主键 + * @return 结果 + */ + @Override + public int deletePatientTaskExecuteRecordById(Long id) { + return patientTaskExecuteRecordMapper.deletePatientTaskExecuteRecordById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java index 3bb2d84d..851b9e90 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.specialdiseasenode; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import java.util.List; @@ -17,7 +18,7 @@ public interface ISpecialDiseaseNodeService { * @param id 专病路径-管理节点信息主键 * @return 专病路径-管理节点信息 */ - public SpecialDiseaseNode selectSpecialDiseaseNodeById(Long id); + SpecialDiseaseNode selectSpecialDiseaseNodeById(Long id); /** * 查询专病路径-管理节点信息列表 @@ -25,7 +26,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 专病路径-管理节点信息集合 */ - public List selectSpecialDiseaseNodeList(SpecialDiseaseNode specialDiseaseNode); + List selectSpecialDiseaseNodeList(SpecialDiseaseNode specialDiseaseNode); /** * 新增专病路径-管理节点信息 @@ -33,7 +34,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - public int insertSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); + int insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); /** * 修改专病路径-管理节点信息 @@ -41,7 +42,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - public int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); + int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); /** * 批量删除专病路径-管理节点信息 @@ -49,7 +50,7 @@ public interface ISpecialDiseaseNodeService { * @param ids 需要删除的专病路径-管理节点信息主键集合 * @return 结果 */ - public int deleteSpecialDiseaseNodeByIds(Long[] ids); + int deleteSpecialDiseaseNodeByIds(Long[] ids); /** * 删除专病路径-管理节点信息信息 @@ -57,5 +58,5 @@ public interface ISpecialDiseaseNodeService { * @param id 专病路径-管理节点信息主键 * @return 结果 */ - public int deleteSpecialDiseaseNodeById(Long id); + int deleteSpecialDiseaseNodeById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 57be9bcd..5e8d7c42 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -1,6 +1,8 @@ package com.xinelu.manage.service.specialdiseasenode.impl; +import com.xinelu.common.utils.SecurityUtils; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; import org.springframework.stereotype.Service; @@ -50,9 +52,12 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService * @return 结果 */ @Override - public int insertSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode) { - specialDiseaseNode.setCreateTime(LocalDateTime.now()); - return specialDiseaseNodeMapper.insertSpecialDiseaseNode(specialDiseaseNode); + public int insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + for (SpecialDiseaseNode diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { + diseaseNode.setCreateTime(LocalDateTime.now()); + diseaseNode.setCreateBy(SecurityUtils.getUsername()); + } + return specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList()); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java new file mode 100644 index 00000000..5f15f5d2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java @@ -0,0 +1,156 @@ +package com.xinelu.manage.vo.patienttaskexecuterecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + + +/** + * 患者管理任务执行记录对象 patient_task_execute_record + * + * @author xinelu + * @date 2024-03-25 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者管理任务执行记录对象", description = "patient_task_execute_record") +public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord { + + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + private String patientName; + + /** + * 患者电话 + */ + @ApiModelProperty(value = "患者电话") + private String patientPhone; + + /** + * 就诊流水号 + */ + @ApiModelProperty(value = "就诊流水号") + private String visitSerialNumber; + + /** + * 所属医院id + */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** + * 所属医院名称 + */ + @ApiModelProperty(value = "所属医院名称") + private String hospitalAgencyName; + + /** + * 所属院区id + */ + @ApiModelProperty(value = "所属院区id") + private Long campusAgencyId; + + /** + * 所属院区名称 + */ + @ApiModelProperty(value = "所属院区名称") + private String campusAgencyName; + + /** + * 所属科室id + */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** + * 所属科室名称 + */ + @ApiModelProperty(value = "所属科室名称") + private String departmentName; + + /** + * 所属病区id + */ + @ApiModelProperty(value = "所属病区id") + private Long wardId; + + /** + * 所属病区名称 + */ + @ApiModelProperty(value = "所属病区名称") + private String wardName; + + /** + * 手术名称 + */ + @ApiModelProperty(value = "手术名称") + private String surgicalName; + + /** + * 入院时间，时间格式：yyyy-MM-dd + */ + @ApiModelProperty(value = "入院时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate admissionDate; + + /** + * 出院时间（出院患者），时间格式：yyyy-MM-dd + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "出院时间（出院患者）") + private LocalDate dischargeDate; + + /** + * 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL + */ + @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") + private String visitMethod; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; + + /** + * 家属电话 + */ + @ApiModelProperty(value = "家属电话") + private String familyMemberPhone; + + /** + * 出生日期，格式：yyyy-MM-dd + */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate birthDate; + + /** + * 身份证号 + */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** + * 性别，男：MALE，女：FEMALE + */ + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + private String sex; + + /** + * 住址 + */ + @ApiModelProperty(value = "住址") + private String address; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml new file mode 100644 index 00000000..3b94e350 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, + patient_id, + manage_route_id, + manage_route_node_id, + patient_name, + manage_route_name, + manage_route_node_name, + task_content, + execute_time, + execute_person, + execute_type, + execute_remark, + create_by, + create_time, + update_by, + update_time + from patient_task_execute_record + + + + + + + + + + insert into patient_task_execute_record + + patient_id, + + manage_route_id, + + manage_route_node_id, + + patient_name, + + manage_route_name, + + manage_route_node_name, + + task_content, + + execute_time, + + execute_person, + + execute_type, + + execute_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientId}, + + #{manageRouteId}, + + #{manageRouteNodeId}, + + #{patientName}, + + #{manageRouteName}, + + #{manageRouteNodeName}, + + #{taskContent}, + + #{executeTime}, + + #{executePerson}, + + #{executeType}, + + #{executeRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_task_execute_record + + patient_id = + #{patientId}, + + manage_route_id = + #{manageRouteId}, + + manage_route_node_id = + #{manageRouteNodeId}, + + patient_name = + #{patientName}, + + manage_route_name = + #{manageRouteName}, + + manage_route_node_name = + #{manageRouteNodeName}, + + task_content = + #{taskContent}, + + execute_time = + #{executeTime}, + + execute_person = + #{executePerson}, + + execute_type = + #{executeType}, + + execute_remark = + #{executeRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from patient_task_execute_record + where id = #{id} + + + + delete from patient_task_execute_record where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index 9c24053c..eebe0d9f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -569,4 +569,97 @@ #{id} + + + insert into special_disease_node( + route_id, + route_name, + route_node_name, + route_node_day, + task_type, + task_subdivision, + task_status, + second_classify_describe, + execution_time, + template_id, + template_name, + template_type, + message_push_sign, + message_template__id, + message_template_name, + message_preview, + message_node_content, + official_push_sign, + official_template_id, + official_template_name, + official_remind_content, + official_node_content, + applet_push_sign, + applet_template_id, + applet_template_name, + applet_remind_content, + applet_prompt_description, + applet_node_content, + phone_push_sign, + phone_template_id, + phone_template_name, + phone_message_remind, + phone_message_template_id, + phone_message_template_name, + phone_agency_name, + phone_node_content, + route_check_status, + route_check_person, + route_check_date, + route_check_remark, + create_by, + create_time + ) values + + ( + #{specialDiseaseNodeList.routeId}, + #{specialDiseaseNodeList.routeName}, + #{specialDiseaseNodeList.routeNodeName}, + #{specialDiseaseNodeList.routeNodeDay}, + #{specialDiseaseNodeList.taskType}, + #{specialDiseaseNodeList.taskSubdivision}, + #{specialDiseaseNodeList.taskStatus}, + #{specialDiseaseNodeList.secondClassifyDescribe}, + #{specialDiseaseNodeList.executionTime}, + #{specialDiseaseNodeList.templateId}, + #{specialDiseaseNodeList.templateName}, + #{specialDiseaseNodeList.templateType}, + #{specialDiseaseNodeList.messagePushSign}, + #{specialDiseaseNodeList.messageTemplateId}, + #{specialDiseaseNodeList.messageTemplateName}, + #{specialDiseaseNodeList.messagePreview}, + #{specialDiseaseNodeList.messageNodeContent}, + #{specialDiseaseNodeList.officialPushSign}, + #{specialDiseaseNodeList.officialTemplateId}, + #{specialDiseaseNodeList.officialTemplateName}, + #{specialDiseaseNodeList.officialRemindContent}, + #{specialDiseaseNodeList.officialNodeContent}, + #{specialDiseaseNodeList.appletPushSign}, + #{specialDiseaseNodeList.appletTemplateId}, + #{specialDiseaseNodeList.appletTemplateName}, + #{specialDiseaseNodeList.appletRemindContent}, + #{specialDiseaseNodeList.appletPromptDescription}, + #{specialDiseaseNodeList.appletNodeContent}, + #{specialDiseaseNodeList.phonePushSign}, + #{specialDiseaseNodeList.phoneTemplateId}, + #{specialDiseaseNodeList.phoneTemplateName}, + #{specialDiseaseNodeList.phoneMessageRemind}, + #{specialDiseaseNodeList.phoneMessageTemplateId}, + #{specialDiseaseNodeList.phoneMessageTemplateName}, + #{specialDiseaseNodeList.phoneAgencyName}, + #{specialDiseaseNodeList.phoneNodeContent}, + #{specialDiseaseNodeList.routeCheckStatus}, + #{specialDiseaseNodeList.routeCheckPerson}, + #{specialDiseaseNodeList.routeCheckDate}, + #{specialDiseaseNodeList.routeCheckRemark}, + #{specialDiseaseNodeList.createBy}, + #{specialDiseaseNodeList.createTime} + ) + + \ No newline at end of file From d646a626800427e012d1e9b8f9b5b8b0c984e73e Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 26 Mar 2024 10:35:53 +0800 Subject: [PATCH 21/32] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E5=9B=AD=E5=8C=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/agency/AgencyController.java | 6 +++ .../xinelu/manage/dto/agency/HospitalDTO.java | 27 +++++++++++ .../manage/service/agency/IAgencyService.java | 3 ++ .../agency/impl/AgencyServiceImpl.java | 46 +++++++++++++++++++ .../xinelu/manage/vo/agency/HospitalVO.java | 26 +++++++++++ 5 files changed, 108 insertions(+) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/agency/HospitalDTO.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index 960ba87a..0cdb002d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -8,6 +8,7 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.dto.agency.HospitalDTO; import com.xinelu.manage.service.agency.IAgencyService; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; @@ -144,4 +145,9 @@ public class AgencyController extends BaseController { List list = util.importExcel(file.getInputStream()); return agencyService.insertAgencyImportList(list); } + + @GetMapping("/getAgencyList") + public AjaxResult getAgencyList(HospitalDTO hospitalDTO) { + return agencyService.getAgencyList(hospitalDTO); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/agency/HospitalDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/agency/HospitalDTO.java new file mode 100644 index 00000000..0642f197 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/agency/HospitalDTO.java @@ -0,0 +1,27 @@ +package com.xinelu.manage.dto.agency; + +import lombok.Data; + +@Data +public class HospitalDTO { + + /** + * 类型 + */ + private String nodeType; + + /** + * 医院id + */ + private Long hospitalId; + + /** + * 园区id + */ + private Long campusId; + + /** + * 科室id + */ + private Long departmentId; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java index de76ea33..6b758978 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.agency; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.dto.agency.HospitalDTO; import com.xinelu.manage.vo.agency.AgencyTreeVO; import com.xinelu.manage.vo.agency.AgencyVO; @@ -94,4 +95,6 @@ public interface IAgencyService { * @return int **/ AjaxResult insertAgencyImportList(List agencyList); + + AjaxResult getAgencyList(HospitalDTO hospitalDTO); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index f5e69a78..a77de1ff 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -1,16 +1,21 @@ package com.xinelu.manage.service.agency.impl; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.enums.NodeTypeEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.common.utils.regex.RegexUtil; import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.dto.agency.HospitalDTO; import com.xinelu.manage.mapper.agency.AgencyMapper; +import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.mapper.sysarea.SysAreaMapper; import com.xinelu.manage.service.agency.IAgencyService; import com.xinelu.manage.vo.agency.AgencyTreeVO; import com.xinelu.manage.vo.agency.AgencyVO; +import com.xinelu.manage.vo.agency.HospitalVO; import com.xinelu.manage.vo.sysarea.SysAreaVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -41,6 +46,9 @@ public class AgencyServiceImpl implements IAgencyService { private RegexUtil regexUtil; @Resource private SysAreaMapper sysAreaMapper; + @Resource + private DepartmentMapper departmentMapper; + /** * 查询机构信息 @@ -226,6 +234,44 @@ public class AgencyServiceImpl implements IAgencyService { return AjaxResult.success(); } + @Override + public AjaxResult getAgencyList(HospitalDTO hospitalDTO) { + HospitalVO hospitalVO = new HospitalVO(); + if (StringUtils.isNotBlank(hospitalDTO.getNodeType()) && NodeTypeEnum.HOSPITAL.getInfo().equals(hospitalDTO.getNodeType()) && Objects.nonNull(hospitalDTO.getHospitalId())) { + Agency agency = new Agency(); + agency.setNodeType(NodeTypeEnum.CAMPUS.getInfo()); + agency.setParentId(hospitalDTO.getHospitalId()); + List campusList = agencyMapper.selectAgencyList(agency); + hospitalVO.setCampusList(campusList); + Department department = new Department(); + department.setNodeType(NodeTypeEnum.DEPARTMENT.getInfo()); + department.setAgencyId(hospitalDTO.getHospitalId()); + List departmentList = departmentMapper.selectDepartmentList(department); + hospitalVO.setDepartmentList(departmentList); + department.setNodeType(NodeTypeEnum.WARD.getInfo()); + List wardList = departmentMapper.selectDepartmentList(department); + hospitalVO.setWardList(wardList); + } + if (StringUtils.isNotBlank(hospitalDTO.getNodeType()) && NodeTypeEnum.CAMPUS.getInfo().equals(hospitalDTO.getNodeType()) && Objects.nonNull(hospitalDTO.getCampusId())) { + Department department = new Department(); + department.setNodeType(NodeTypeEnum.DEPARTMENT.getInfo()); + department.setAgencyId(hospitalDTO.getCampusId()); + List departmentList = departmentMapper.selectDepartmentList(department); + hospitalVO.setDepartmentList(departmentList); + department.setNodeType(NodeTypeEnum.WARD.getInfo()); + List wardList = departmentMapper.selectDepartmentList(department); + hospitalVO.setWardList(wardList); + } + if (StringUtils.isNotBlank(hospitalDTO.getNodeType()) && NodeTypeEnum.DEPARTMENT.getInfo().equals(hospitalDTO.getNodeType()) && Objects.nonNull(hospitalDTO.getDepartmentId())) { + Department department = new Department(); + department.setNodeType(NodeTypeEnum.WARD.getInfo()); + department.setParentDepartmentId(hospitalDTO.getDepartmentId()); + List wardList = departmentMapper.selectDepartmentList(department); + hospitalVO.setWardList(wardList); + } + return AjaxResult.success(hospitalVO); + } + public List buildDeptTree(List agencies) { List returnList = new ArrayList(); List tempList = new ArrayList(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java new file mode 100644 index 00000000..9cec0bf0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java @@ -0,0 +1,26 @@ +package com.xinelu.manage.vo.agency; + +import com.xinelu.manage.domain.agency.Agency; +import com.xinelu.manage.domain.department.Department; +import lombok.Data; + +import java.util.List; + +@Data +public class HospitalVO { + + /** + * 园区集合 + */ + List campusList; + + /** + * 科室集合 + */ + List departmentList; + + /** + * 病区集合 + */ + List wardList; +} From 521830bb883faafdd7feb1e2e8af7464c789f8c0 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 26 Mar 2024 17:45:29 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xinelu/common/utils/AgeUtil.java | 67 ++++++++++++++++ .../controller/agency/AgencyController.java | 2 +- .../PatientTaskExecuteRecordController.java | 8 ++ .../TaskStatusDictController.java | 5 ++ .../PatientTaskExecuteRecord.java | 3 + .../PatientVisitRecord.java | 2 + .../PatientTaskExecuteRecordMapper.java | 8 ++ .../manage/service/agency/IAgencyService.java | 8 -- .../agency/impl/AgencyServiceImpl.java | 12 --- .../IPatientTaskExecuteRecordService.java | 9 +++ .../PatientTaskExecuteRecordServiceImpl.java | 15 ++++ .../PatientTaskExecuteRecordVO.java | 80 +++---------------- .../PatientTaskExecuteRecordMapper.xml | 40 ++++++++-- 13 files changed, 164 insertions(+), 95 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/utils/AgeUtil.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/utils/AgeUtil.java b/postdischarge-common/src/main/java/com/xinelu/common/utils/AgeUtil.java new file mode 100644 index 00000000..5c9d13d0 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/utils/AgeUtil.java @@ -0,0 +1,67 @@ +package com.xinelu.common.utils; + +import com.xinelu.common.exception.ServiceException; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Calendar; +import java.util.GregorianCalendar; + +/** + * @author ljh + * @version 1.0 + * Create by 2023/2/27 11:45 + */ +public class AgeUtil { + + /** + * 根据出生日期计算年龄数值 + * + * @param date 出生日期 + * @return 年龄数值 + */ + public static Long getAgeMonth(String date) { + if (StringUtils.isBlank(date)) { + throw new ServiceException("请输入正确的出生日期！"); + } + String[] data = StringUtils.split(date, "-"); + if (data.length < 3) { + throw new ServiceException("请输入正确的出生日期！"); + } + Calendar birthday = new GregorianCalendar(Integer.parseInt(data[0]), Integer.parseInt(data[1]), Integer.parseInt(data[2])); + Calendar now = Calendar.getInstance(); + int day = now.get(Calendar.DAY_OF_MONTH) - birthday.get(Calendar.DAY_OF_MONTH); + //月份从0开始计算，所以需要+1 + int month = now.get(Calendar.MONTH) + 1 - birthday.get(Calendar.MONTH); + BigDecimal monthFraction; + int year = now.get(Calendar.YEAR) - birthday.get(Calendar.YEAR); + //按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。 + if (day < 0) { + month -= 1; + //得到上一个月，用来得到上个月的天数。 + now.add(Calendar.MONTH, -1); + } + if (month < 0) { + //当前月份加12个月 + monthFraction = BigDecimal.valueOf(month).add(BigDecimal.valueOf(12)).divide(BigDecimal.valueOf(12), 1, RoundingMode.HALF_UP); + year--; + } else { + //当前月份 + monthFraction = BigDecimal.valueOf(month).divide(BigDecimal.valueOf(12), 1, RoundingMode.HALF_UP); + } + BigDecimal bigDecimal = BigDecimal.ZERO; + if (year >= 0) { + bigDecimal = bigDecimal.add(BigDecimal.valueOf(year)); + } + if ((monthFraction.compareTo(BigDecimal.ZERO) > 0)) { + bigDecimal = bigDecimal.add(monthFraction); + } + //今天出生 + if (year == 0 && month == 0 && day == 0) { + return BigDecimal.ZERO.longValue(); + } + return Math.round(bigDecimal.doubleValue()); + } + +} + diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index 0cdb002d..fd670f1f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -59,7 +59,7 @@ public class AgencyController extends BaseController { if (Objects.isNull(agency) || Objects.isNull(agency.getParentId())) { return AjaxResult.success(); } - return agencyService.subordinateAgencyList(agency); + return agencyService.selectAgencyByIdList(agency); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java index 57ab0956..6fefa55f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java @@ -76,4 +76,12 @@ public class PatientTaskExecuteRecordController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(patientTaskExecuteRecordService.deletePatientTaskExecuteRecordByIds(ids)); } + + /** + * 根据患者信息查询就诊记录 + */ + @GetMapping("/selectVisitRecord") + public AjaxResult selectVisitRecord(Long id) { + return patientTaskExecuteRecordService.selectVisitRecord(id); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java index ff067538..427cbda5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java @@ -38,6 +38,11 @@ public class TaskStatusDictController extends BaseController { return getDataTable(list); } + @GetMapping("/taskStatusDictList") + public AjaxResult taskStatusDictList(TaskStatusDict taskStatusDict) { + return AjaxResult.success(taskStatusDictService.selectTaskStatusDictList(taskStatusDict)); + } + /** * 导出任务状态字典列表 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java index 1db99cc0..6bbd0bdf 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java @@ -112,6 +112,9 @@ public class PatientTaskExecuteRecord extends BaseEntity { @Excel(name = "备注信息") private String executeRemark; + @ApiModelProperty(value = "患者就诊记录基本信息表id") + @Excel(name = "患者就诊记录基本信息表id") + private Long visitRecordId; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 17ca9406..4c1878e0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -218,4 +218,6 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "手术名称") private String surgicalName; + @ApiModelProperty(value = "手术记录") + private String surgicalRecord; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java index c5d1cbb2..e603d004 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java @@ -67,4 +67,12 @@ public interface PatientTaskExecuteRecordMapper { * @return 结果 */ int deletePatientTaskExecuteRecordByIds(Long[] ids); + + /** + * 根据患者信息查询就诊记录 + * + * @param id id + * @return AjaxResult + */ + PatientTaskExecuteRecordVO selectVisitRecord(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java index 6b758978..f0e90cd4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java @@ -40,14 +40,6 @@ public interface IAgencyService { */ AjaxResult selectAgencyByIdList(Agency agency); - /** - * 查询院区机构信息列表 - * - * @param agency 机构信息 - * @return 机构信息集合 - */ - AjaxResult subordinateAgencyList(Agency agency); - /** * 新增机构信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index a77de1ff..8a8f85a0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -98,18 +98,6 @@ public class AgencyServiceImpl implements IAgencyService { } - /** - * 查询院区机构信息列表 - * - * @param agency 机构信息 - * @return 机构信息 - */ - @Override - public AjaxResult subordinateAgencyList(Agency agency) { - return AjaxResult.success(agencyMapper.selectAgencyList(agency)); - } - - /** * 新增机构信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java index b3d41ea2..891e2721 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.patienttaskexecuterecord; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; @@ -59,4 +60,12 @@ public interface IPatientTaskExecuteRecordService { * @return 结果 */ int deletePatientTaskExecuteRecordById(Long id); + + /** + * 根据患者信息查询就诊记录 + * + * @param id 记录id + * @return AjaxResult + */ + AjaxResult selectVisitRecord(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java index cb7baeb8..f0e16fd9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java @@ -1,5 +1,7 @@ package com.xinelu.manage.service.patienttaskexecuterecord.impl; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.utils.AgeUtil; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecordMapper; import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService; @@ -88,4 +90,17 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR public int deletePatientTaskExecuteRecordById(Long id) { return patientTaskExecuteRecordMapper.deletePatientTaskExecuteRecordById(id); } + + /** + * 根据患者信息查询就诊记录 + * + * @param id id + * @return AjaxResult + */ + @Override + public AjaxResult selectVisitRecord(Long id) { + PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(id); + patientTaskExecuteRecordVO.setAge(AgeUtil.getAgeMonth(patientTaskExecuteRecordVO.getBirthDate().toString())); + return AjaxResult.success(patientTaskExecuteRecordVO); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java index 5f15f5d2..b13a3070 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java @@ -2,12 +2,9 @@ package com.xinelu.manage.vo.patienttaskexecuterecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import java.time.LocalDate; @@ -18,102 +15,57 @@ import java.time.LocalDate; * @author xinelu * @date 2024-03-25 */ -@Data -@AllArgsConstructor -@NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "患者管理任务执行记录对象", description = "patient_task_execute_record") +@Data public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord { - /** - * 患者姓名 - */ + @ApiModelProperty(value = "患者年龄") + private Long age; + @ApiModelProperty(value = "患者姓名") private String patientName; - /** - * 患者电话 - */ @ApiModelProperty(value = "患者电话") private String patientPhone; - /** - * 就诊流水号 - */ @ApiModelProperty(value = "就诊流水号") private String visitSerialNumber; - /** - * 所属医院id - */ @ApiModelProperty(value = "所属医院id") private Long hospitalAgencyId; - /** - * 所属医院名称 - */ @ApiModelProperty(value = "所属医院名称") private String hospitalAgencyName; - /** - * 所属院区id - */ @ApiModelProperty(value = "所属院区id") private Long campusAgencyId; - /** - * 所属院区名称 - */ @ApiModelProperty(value = "所属院区名称") private String campusAgencyName; - /** - * 所属科室id - */ @ApiModelProperty(value = "所属科室id") private Long departmentId; - /** - * 所属科室名称 - */ @ApiModelProperty(value = "所属科室名称") private String departmentName; - /** - * 所属病区id - */ @ApiModelProperty(value = "所属病区id") private Long wardId; - /** - * 所属病区名称 - */ @ApiModelProperty(value = "所属病区名称") private String wardName; - /** - * 手术名称 - */ @ApiModelProperty(value = "手术名称") private String surgicalName; - /** - * 入院时间，时间格式：yyyy-MM-dd - */ @ApiModelProperty(value = "入院时间") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate admissionDate; - /** - * 出院时间（出院患者），时间格式：yyyy-MM-dd - */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "出院时间（出院患者）") private LocalDate dischargeDate; - /** - * 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL - */ @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; @@ -123,34 +75,28 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate endDate; - /** - * 家属电话 - */ @ApiModelProperty(value = "家属电话") private String familyMemberPhone; - /** - * 出生日期，格式：yyyy-MM-dd - */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate birthDate; - /** - * 身份证号 - */ @ApiModelProperty(value = "身份证号") private String cardNo; - /** - * 性别，男：MALE，女：FEMALE - */ @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") private String sex; - /** - * 住址 - */ @ApiModelProperty(value = "住址") private String address; + + @ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息") + private String inHospitalInfo; + + @ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息") + private String outHospitalInfo; + + @ApiModelProperty(value = "手术记录") + private String surgicalRecord; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml index 3b94e350..4c5846e3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -17,6 +17,7 @@ + @@ -36,6 +37,7 @@ execute_person, execute_type, execute_remark, + visit_record_id, create_by, create_time, update_by, @@ -56,6 +58,9 @@ and manage_route_node_id = #{manageRouteNodeId} + + and visit_record_id = #{visitRecordId} + and patient_name like concat('%', #{patientName}, '%') @@ -96,7 +101,6 @@ pter.execute_time, pter.execute_person, pter.execute_type, - pi.patient_phone, pi.patient_type, pi.visit_method, pi.hospital_agency_name, @@ -107,13 +111,9 @@ pi.admission_date, pi.discharge_date, pi.in_hospital_number, - pi.family_member_phone, - pi.birth_date, - pi.card_no, - pi.sex, - pi.address + pi.patient_phone from patient_task_execute_record pter - left join patient_info pi ON pi.id = pter.patient_id + LEFT JOIN patient_info pi ON pi.id = pter.patient_id where pi.del_flag = 0 and pi.patient_name = #{patientName} @@ -181,6 +181,8 @@ update_time, + visit_record_id, + #{patientId}, @@ -213,6 +215,8 @@ #{updateTime}, + #{visitRecordId}, + @@ -228,6 +232,9 @@ manage_route_node_id = #{manageRouteNodeId}, + + and visit_record_id = #{visitRecordId} + patient_name = #{patientName}, @@ -280,4 +287,23 @@ #{id} + + \ No newline at end of file From 5b12ac02ccfd9cf7137fd4254fe8f26ab60cde1f Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 27 Mar 2024 17:43:59 +0800 Subject: [PATCH 23/32] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDiseaseNodeController.java | 6 +- .../SpecialDiseaseNodeDTO.java | 11 ++- .../SpecialDiseaseNodeMapper.java | 8 ++ .../SpecialDiseaseTriggerConditionMapper.java | 8 ++ .../ISpecialDiseaseNodeService.java | 5 +- .../impl/SpecialDiseaseNodeServiceImpl.java | 87 +++++++++++++++++-- .../SpecialDiseaseNodeMapper.xml | 6 ++ .../SpecialDiseaseTriggerConditionMapper.xml | 6 ++ 8 files changed, 124 insertions(+), 13 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java index 257829b3..d8b4f1f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java @@ -67,7 +67,7 @@ public class SpecialDiseaseNodeController extends BaseController { @Log(title = "专病路径-管理节点信息", businessType = BusinessType.INSERT) @PostMapping("/add") public AjaxResult add(@RequestBody SpecialDiseaseNodeDTO specialDiseaseNode) { - return toAjax(specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode)); + return specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode); } /** @@ -76,8 +76,8 @@ public class SpecialDiseaseNodeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:edit')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.UPDATE) @PutMapping("/edit") - public AjaxResult edit(@RequestBody SpecialDiseaseNode specialDiseaseNode) { - return toAjax(specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode)); + public AjaxResult edit(@RequestBody SpecialDiseaseNodeDTO specialDiseaseNode) { + return specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java index 1fc9cd53..9b839e64 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java @@ -1,8 +1,10 @@ package com.xinelu.manage.dto.specialdiseasenode; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; -import io.swagger.annotations.ApiModel; +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -12,10 +14,13 @@ import java.util.List; * @author xinelu * @date 2024-03-13 */ +@EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "专病路径-管理节点信息对象", description = "special_disease_node") -public class SpecialDiseaseNodeDTO { +public class SpecialDiseaseNodeDTO extends SpecialDiseaseRoute { List specialDiseaseNodeList; + + + List triggerConditionList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index 5f78c086..5ba1db15 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -61,4 +61,12 @@ public interface SpecialDiseaseNodeMapper { int deleteSpecialDiseaseNodeByIds(Long[] ids); int insertSpecialDiseaseNodeList(List specialDiseaseNodeList); + + /** + * 删除专病路径-管理节点信息 + * + * @param routeId 专病路径-管理节点信息主键 + * @return 结果 + */ + int deleteSpecialDiseaseNodeByRouteId(Long routeId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java index 2bd41168..e563285d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java @@ -66,4 +66,12 @@ public interface SpecialDiseaseTriggerConditionMapper { * @return 结果 */ int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + + /** + * 删除触发条件关系 + * + * @param routeId 触发条件关系主键 + * @return 结果 + */ + int deleteSpecialDiseaseTriggerConditionByRouteId(Long routeId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java index 851b9e90..4c5898b8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.specialdiseasenode; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; @@ -34,7 +35,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - int insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); + AjaxResult insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); /** * 修改专病路径-管理节点信息 @@ -42,7 +43,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode); + AjaxResult updateSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); /** * 批量删除专病路径-管理节点信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 5e8d7c42..c6b722a5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -1,11 +1,20 @@ package com.xinelu.manage.service.specialdiseasenode.impl; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; +import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; +import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -18,10 +27,16 @@ import java.util.List; * @author xinelu * @date 2024-03-13 */ +@Slf4j @Service public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService { @Resource private SpecialDiseaseNodeMapper specialDiseaseNodeMapper; + @Resource + private SpecialDiseaseRouteMapper specialDiseaseRouteMapper; + @Resource + private SpecialDiseaseTriggerConditionMapper triggerConditionMapper; + /** * 查询专病路径-管理节点信息 @@ -51,13 +66,36 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ + @Transactional(rollbackFor = Exception.class) @Override - public int insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + public AjaxResult insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + SpecialDiseaseRoute specialDiseaseRoute = new SpecialDiseaseRoute(); + BeanUtils.copyBeanProp(specialDiseaseRoute, specialDiseaseNode); + specialDiseaseRoute.setCreateTime(LocalDateTime.now()); + specialDiseaseRoute.setCreateBy(SecurityUtils.getUsername()); + int insertRouteCount = specialDiseaseRouteMapper.insertSpecialDiseaseRoute(specialDiseaseRoute); + if (insertRouteCount < 0) { + throw new ServiceException("新增专病路径管理节点信息失败"); + } for (SpecialDiseaseNode diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { + diseaseNode.setRouteId(specialDiseaseRoute.getId()); diseaseNode.setCreateTime(LocalDateTime.now()); diseaseNode.setCreateBy(SecurityUtils.getUsername()); } - return specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList()); + int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList()); + if (insertNodeCount < 0) { + throw new ServiceException("新增专病路径管理节点信息失败"); + } + for (SpecialDiseaseTriggerCondition triggerCondition : specialDiseaseNode.getTriggerConditionList()) { + triggerCondition.setRouteId(specialDiseaseRoute.getId()); + triggerCondition.setCreateTime(LocalDateTime.now()); + triggerCondition.setCreateBy(SecurityUtils.getUsername()); + } + int insertConditionCount = triggerConditionMapper.insertTriggerConditionList(specialDiseaseNode.getTriggerConditionList()); + if (insertConditionCount < 0) { + throw new ServiceException("新增专病路径管理节点信息失败"); + } + return AjaxResult.success(); } /** @@ -66,10 +104,49 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ + @Transactional(rollbackFor = Exception.class) @Override - public int updateSpecialDiseaseNode(SpecialDiseaseNode specialDiseaseNode) { - specialDiseaseNode.setUpdateTime(LocalDateTime.now()); - return specialDiseaseNodeMapper.updateSpecialDiseaseNode(specialDiseaseNode); + public AjaxResult updateSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + SpecialDiseaseRoute specialDiseaseRoute = new SpecialDiseaseRoute(); + BeanUtils.copyBeanProp(specialDiseaseRoute, specialDiseaseNode); + specialDiseaseRoute.setUpdateTime(LocalDateTime.now()); + specialDiseaseRoute.setUpdateBy(SecurityUtils.getUsername()); + int updateRouteCount = specialDiseaseRouteMapper.updateSpecialDiseaseRoute(specialDiseaseRoute); + if (updateRouteCount < 0) { + log.info("修改专病路径失败"); + throw new ServiceException("修改专病路径管理节点信息失败"); + } + int deleteCount = specialDiseaseNodeMapper.deleteSpecialDiseaseNodeByRouteId(specialDiseaseNode.getId()); + if (deleteCount < 0) { + log.info("删除管理节点信息失败"); + throw new ServiceException("修改专病路径管理节点信息失败"); + } + for (SpecialDiseaseNode diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { + diseaseNode.setRouteId(specialDiseaseRoute.getId()); + diseaseNode.setUpdateTime(LocalDateTime.now()); + diseaseNode.setUpdateBy(SecurityUtils.getUsername()); + } + int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList()); + if (insertNodeCount < 0) { + log.info("新增管理节点信息失败"); + throw new ServiceException("修改专病路径管理节点信息失败"); + } + int deleteConditionCont = triggerConditionMapper.deleteSpecialDiseaseTriggerConditionByRouteId(specialDiseaseRoute.getId()); + if (deleteConditionCont < 0) { + log.info("删除触发条件失败"); + throw new ServiceException("修改专病路径管理节点信息失败"); + } + for (SpecialDiseaseTriggerCondition triggerCondition : specialDiseaseNode.getTriggerConditionList()) { + triggerCondition.setRouteId(specialDiseaseRoute.getId()); + triggerCondition.setUpdateTime(LocalDateTime.now()); + triggerCondition.setUpdateBy(SecurityUtils.getUsername()); + } + int insertConditionCount = triggerConditionMapper.insertTriggerConditionList(specialDiseaseNode.getTriggerConditionList()); + if (insertConditionCount < 0) { + log.info("新增触发条件信息失败"); + throw new ServiceException("修改专病路径管理节点信息失败"); + } + return AjaxResult.success(); } /** diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index eebe0d9f..cd0f81f4 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -662,4 +662,10 @@ ) + + + delete + from special_disease_node + where route_id = #{routeId} + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml index 72f89394..91f2be29 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml @@ -216,4 +216,10 @@ #{id} + + + delete + from special_disease_trigger_condition + where route_id = #{routeId} + \ No newline at end of file From 05e2793de047ba78b7722d012037e9cc16a7ea56 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 28 Mar 2024 09:43:15 +0800 Subject: [PATCH 24/32] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDiseaseNodeController.java | 8 ++ .../SpecialDiseaseNodeDTO.java | 10 +- .../SpecialDiseaseNodeMapper.java | 10 ++ .../ISpecialDiseaseNodeService.java | 8 ++ .../impl/SpecialDiseaseNodeServiceImpl.java | 11 ++ .../SpecialDiseaseNodeMapper.xml | 102 ++++++++++++++++++ 6 files changed, 148 insertions(+), 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java index d8b4f1f2..6ce168d8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java @@ -89,4 +89,12 @@ public class SpecialDiseaseNodeController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(specialDiseaseNodeService.deleteSpecialDiseaseNodeByIds(ids)); } + + /** + * 查询专病路径-管理节点信息列表 - 触发条件列表 + */ + @GetMapping("/selectSpecialDisease") + public AjaxResult selectSpecialDisease(Long routeId) { + return specialDiseaseNodeService.selectSpecialDisease(routeId); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java index 9b839e64..aa30da24 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java @@ -3,6 +3,7 @@ package com.xinelu.manage.dto.specialdiseasenode; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,9 +19,16 @@ import java.util.List; @Data public class SpecialDiseaseNodeDTO extends SpecialDiseaseRoute { + @ApiModelProperty(value = "专病路径表id") + private Long routeId; + /** + * 专病路径 + */ List specialDiseaseNodeList; - + /** + * 节点信息 + */ List triggerConditionList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index 5ba1db15..2385ef3b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.specialdiseasenode; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import java.util.List; @@ -69,4 +70,13 @@ public interface SpecialDiseaseNodeMapper { * @return 结果 */ int deleteSpecialDiseaseNodeByRouteId(Long routeId); + + + /** + * 查询专病路径-管理节点信息 + * + * @param routeId 专病路径-管理节点信息主键 + * @return 专病路径-管理节点信息 + */ + SpecialDiseaseNodeDTO selectSpecialDiseaseByRouteId(Long routeId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java index 4c5898b8..84012f32 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java @@ -60,4 +60,12 @@ public interface ISpecialDiseaseNodeService { * @return 结果 */ int deleteSpecialDiseaseNodeById(Long id); + + /** + * 查询专病路径-管理节点信息列表 - 触发条件列表 + * + * @param routeId 路径id + * @return AjaxResult + */ + AjaxResult selectSpecialDisease(Long routeId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index c6b722a5..419e6076 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -170,4 +170,15 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService public int deleteSpecialDiseaseNodeById(Long id) { return specialDiseaseNodeMapper.deleteSpecialDiseaseNodeById(id); } + + /** + * 查询专病路径-管理节点信息列表 - 触发条件列表 + * + * @param routeId 路径id + * @return AjaxResult + */ + @Override + public AjaxResult selectSpecialDisease(Long routeId) { + return AjaxResult.success(specialDiseaseNodeMapper.selectSpecialDiseaseByRouteId(routeId)); + } } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index cd0f81f4..f39c11bd 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -4,6 +4,26 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + @@ -52,6 +72,18 @@ + + + + + + + + + + + + select id, route_id, @@ -668,4 +700,74 @@ from special_disease_node where route_id = #{routeId} + + \ No newline at end of file From 657dbb5007715d346aee54856adb09985c2fef4e Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 28 Mar 2024 17:01:33 +0800 Subject: [PATCH 25/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E7=B4=A0=E6=9D=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientinfo/PatientInfoController.java | 5 +- .../PatientVisitRecordController.java | 12 - .../PropagandaInfoController.java | 14 +- .../SignPatientRecordController.java | 12 + .../domain/materialsinfo/MaterialsInfo.java | 3 + .../domain/patientinfo/PatientInfo.java | 12 +- .../PatientPreHospitalization.java | 6 + .../PatientVisitRecord.java | 11 + .../PropagandaMaterials.java | 5 +- .../domain/residentinfo/ResidentInfo.java | 82 +++ .../dto/materialsinfo/MaterialsInfoDto.java | 6 +- .../dto/patientinfo/PatientInfoDto.java | 2 +- .../PatientVisitRecordDto.java | 4 + .../PatientVisitRecordInfoSaveDto.java | 5 + .../PatientVisitRecordSaveDto.java | 4 + .../dto/propagandainfo/PropagandaInfoDto.java | 6 +- .../propagandainfo/PropagandaInfoSaveDto.java | 92 +++ .../signpatientrecord/IntentionalSignDto.java | 32 ++ .../signpatientrecord/SignPatientAddDto.java | 3 + .../PatientVisitRecordMapper.java | 12 +- .../propagandainfo/PropagandaInfoMapper.java | 9 + .../PropagandaMaterialsMapper.java | 21 +- .../residentinfo/ResidentInfoMapper.java | 61 ++ .../SignRouteTriggerConditionMapper.java | 4 + .../impl/MaterialsInfoServiceImpl.java | 33 +- .../patientinfo/IPatientInfoService.java | 2 +- .../impl/PatientInfoServiceImpl.java | 94 ++- .../PatientPreHospitalizationServiceImpl.java | 69 ++- .../IPatientVisitRecordService.java | 6 + .../impl/PatientVisitRecordServiceImpl.java | 52 +- .../IPropagandaInfoService.java | 12 +- .../impl/PropagandaInfoServiceImpl.java | 102 +++- .../residentinfo/IResidentInfoService.java | 60 ++ .../impl/ResidentInfoServiceImpl.java | 81 +++ .../ISignPatientRecordService.java | 12 +- .../impl/SignPatientRecordServiceImpl.java | 59 +- .../vo/patientinfo/PatientBaseInfoVo.java | 4 + .../propagandainfo/PropagandaMaterialsVo.java | 94 +++ .../materialsinfo/MaterialsInfoMapper.xml | 23 +- .../manage/patientinfo/PatientInfoMapper.xml | 31 +- .../PatientPreHospitalizationMapper.xml | 539 +++++++++--------- .../PatientVisitRecordMapper.xml | 80 ++- .../propagandainfo/PropagandaInfoMapper.xml | 274 +++++---- .../PropagandaMaterialsMapper.xml | 195 ++++--- .../residentinfo/ResidentInfoMapper.xml | 186 ++++++ .../SignRouteTriggerConditionMapper.xml | 15 + 46 files changed, 1811 insertions(+), 635 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/IntentionalSignDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/IResidentInfoService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/impl/ResidentInfoServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/propagandainfo/PropagandaMaterialsVo.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/residentinfo/ResidentInfoMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index f2d730f5..3071a896 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -3,6 +3,7 @@ package com.xinelu.manage.controller.patientinfo; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; @@ -77,8 +78,8 @@ public class PatientInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:patientInfo:add')") @Log(title = "患者信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PatientInfo patientInfo) { - return toAjax(patientInfoService.insertPatientInfo(patientInfo)); + public R add(@RequestBody PatientInfo patientInfo) { + return R.ok(patientInfoService.insertPatientInfo(patientInfo)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index d16fde95..0a65b5a4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -5,7 +5,6 @@ import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.R; -import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; @@ -48,17 +47,6 @@ public class PatientVisitRecordController extends BaseController { @Resource private IPatientVisitRecordService patientVisitRecordService; - /** - * 查询患者就诊记录基本信息列表 - */ - @PreAuthorize("@ss.hasPermi('manage:visit:list')") - @GetMapping("/list") - public TableDataInfo list(PatientVisitRecordDto patientVisitRecord) { - startPage(); - List list = patientVisitRecordService.selectPatientVisitRecordList(patientVisitRecord); - return getDataTable(list); - } - /** * 查询患者就诊记录基本信息列表 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java index 5aff982f..2b53fbc4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java @@ -10,9 +10,11 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoSaveDto; import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.manage.vo.department.DepartmentVO; +import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -71,8 +73,8 @@ public class PropagandaInfoController extends BaseController { @ApiOperation("根据id获取宣教库管理详细信息") @PreAuthorize("@ss.hasPermi('manage:propaganda:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(propagandaInfoService.selectPropagandaInfoById(id)); + public R getInfo(@PathVariable("id") Long id) { + return R.ok(propagandaInfoService.selectPropagandaInfoById(id)); } /** @@ -82,8 +84,8 @@ public class PropagandaInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:propaganda:add')") @Log(title = "宣教库管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PropagandaInfo propagandaInfo) { - return toAjax(propagandaInfoService.insertPropagandaInfo(propagandaInfo)); + public AjaxResult add(@RequestBody PropagandaInfoSaveDto propagandaInfoSaveDto) { + return toAjax(propagandaInfoService.insertPropagandaInfo(propagandaInfoSaveDto)); } /** @@ -93,8 +95,8 @@ public class PropagandaInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:propaganda:edit')") @Log(title = "宣教库管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PropagandaInfo propagandaInfo) { - return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfo)); + public AjaxResult edit(@RequestBody PropagandaInfoSaveDto propagandaInfoSaveDto) { + return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfoSaveDto)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java index fbdb30fc..492f19fa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java @@ -3,6 +3,7 @@ package com.xinelu.manage.controller.signpatientrecord; 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.dto.signpatientrecord.IntentionalSignDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; @@ -48,6 +49,17 @@ public class SignPatientRecordController extends BaseController { return getDataTable(list); } + /** + * 意向签约 + */ + @ApiOperation("意向签约") + @PreAuthorize("@ss.hasPermi('manage:signRecord:add')") + @PostMapping("/intentionalSign") + public R intentionalSign(@Valid @RequestBody IntentionalSignDto body) { + int flag = signPatientRecordService.intentionalSign(body); + return flag > 0 ? R.ok() : R.fail(); + } + /** * 签约 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java index 1bd68273..1db8142a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java @@ -118,4 +118,7 @@ public class MaterialsInfo extends BaseEntity { @Excel(name = "素材排序，值越小排序越靠前") private Integer materialsSort; + /** 删除标识，0：未删除，1：已删除 */ + private Integer delFlag; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 0a76d65d..905d5a0a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -30,6 +30,10 @@ public class PatientInfo extends BaseEntity { /** 主键id */ private Long id; + /** 居民信息表id */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; + /** 患者姓名 */ @ApiModelProperty(value = "患者姓名") @Excel(name = "患者姓名") @@ -196,14 +200,6 @@ public class PatientInfo extends BaseEntity { @Excel(name = "出院方式", readConverterExp = "出=院患者") private String dischargeMethod; - /** 微信openid，微信小程序唯一标识 */ - @ApiModelProperty(value = "微信openid，微信小程序唯一标识") - private String openId; - - /** 微信unionid，微信小程序和微信公众号统一标识 */ - @ApiModelProperty(value = "微信unionid，微信小程序和微信公众号统一标识 ") - private String unionId; - /** 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END */ @ApiModelProperty(value = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END") @Excel(name = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java index 810bcba2..d354e8bb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java @@ -20,6 +20,12 @@ public class PatientPreHospitalization extends BaseEntity { */ @ApiModelProperty("主键Id") private Long id; + /** + * 居民信息表id + */ + @ApiModelProperty("居民信息表id") + private Long residentId; + /** * 患者表id */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 17ca9406..e878f411 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -29,6 +29,10 @@ public class PatientVisitRecord extends BaseEntity { /** 主键Id */ private Long id; + /** 居民信息表id */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; + /** 患者表id */ @ApiModelProperty(value = "患者表id") @Excel(name = "患者表id") @@ -218,4 +222,11 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "手术名称") private String surgicalName; + /** 手术记录 */ + @ApiModelProperty(value = "手术记录") + private String surgicalRecord; + + /** 删除标识，0：未删除，1：已删除 */ + private Integer delFlag; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java index f8b09c39..e06d1de5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java @@ -33,7 +33,7 @@ public class PropagandaMaterials extends BaseEntity { /** 宣教名称（宣教标题） */ @ApiModelProperty(value = "宣教名称") - @Excel(name = "宣教名称", readConverterExp = "宣=教标题") + @Excel(name = "宣教名称", readConverterExp = "宣教标题") private String propagandaTitle; /** 素材表id */ @@ -46,5 +46,6 @@ public class PropagandaMaterials extends BaseEntity { @Excel(name = "素材名称") private String materialsName; - + /** 删除标识，0：未删除，1：已删除 */ + private Integer delFlag; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java new file mode 100644 index 00000000..8cd45557 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java @@ -0,0 +1,82 @@ +package com.xinelu.manage.domain.residentinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 居民信息对象 resident_info + * + * @author haown + * @date 2024-03-27 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "居民信息对象", description = "resident_info") +public class ResidentInfo extends BaseEntity { + private static final long serialVersionUID=1L; + + /** 主键id */ + private Long id; + + /** 姓名 */ + @ApiModelProperty(value = "姓名") + @Excel(name = "姓名") + private String patientName; + + /** 电话 */ + @ApiModelProperty(value = "电话") + @Excel(name = "电话") + private String patientPhone; + + /** 家属电话 */ + @ApiModelProperty(value = "家属电话") + @Excel(name = "家属电话") + private String familyMemberPhone; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate; + + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + @Excel(name = "身份证号") + private String cardNo; + + /** 性别，男：MALE，女：FEMALE */ + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + @Excel(name = "性别，男：MALE，女：FEMALE") + private String sex; + + /** 住址 */ + @ApiModelProperty(value = "住址") + @Excel(name = "住址") + private String address; + + /** 微信小程序openid，微信小程序唯一标识 */ + @ApiModelProperty(value = "微信小程序openid，微信小程序唯一标识") + @Excel(name = "微信小程序openid，微信小程序唯一标识") + private String openId; + + /** 微信unionid，微信小程序和微信公众号统一标识 */ + @ApiModelProperty(value = "微信unionid，微信小程序和微信公众号统一标识") + @Excel(name = "微信unionid，微信小程序和微信公众号统一标识") + private String unionId; + + /** 微信公众号openid，微信公众号唯一标识 */ + @ApiModelProperty(value = "微信公众号openid，微信公众号唯一标识") + @Excel(name = "微信公众号openid，微信公众号唯一标识") + private String officialAccountOpenid; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java index ad9bfcb6..e3ca78a4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java @@ -1,11 +1,11 @@ package com.xinelu.manage.dto.materialsinfo; -import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @description: 素材库查询传输对象 @@ -17,11 +17,11 @@ import lombok.Data; public class MaterialsInfoDto { @ApiModelProperty(value = "创建时间开始，yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeStart; @ApiModelProperty(value = "创建时间结束，yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeEnd; /** 素材状态，已上架：LISTED，未上架：NOT_LISTED */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index 184bac0e..3bfeb12f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -92,7 +92,7 @@ public class PatientInfoDto { /** 开证医生（预住院患者） */ @ApiModelProperty(value = "开证医生") - private String certificateIssuingDoctor; + private String certificateIssuingDoctorId; /** 登记号（预住院患者） */ @ApiModelProperty(value = "登记号（预住院患者）") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index 86b0de3a..d05e0491 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -14,6 +14,10 @@ import org.springframework.format.annotation.DateTimeFormat; @Data public class PatientVisitRecordDto { + /** 居民信息表id */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; + /** 患者表id */ @ApiModelProperty(value = "患者表id") private Long patientId; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java index b2e04d0b..6b9f801f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java @@ -120,4 +120,9 @@ public class PatientVisitRecordInfoSaveDto { @Excel(name = "手术名称") private String surgicalName; + /** 手术记录 */ + @ApiModelProperty(value = "手术记录") + @Excel(name = "手术记录") + private String surgicalRecord; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index c1c62135..eec7bc59 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -159,4 +159,8 @@ public class PatientVisitRecordSaveDto { @ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT") @NotNull(message = "患者类型不能为空") private String patientType; + + /** 手术记录 */ + @ApiModelProperty(value = "手术记录") + private String surgicalRecord; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java index 6fc1b862..b370cfa3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java @@ -1,11 +1,11 @@ package com.xinelu.manage.dto.propagandainfo; -import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @description: 宣教库查询传输对象 @@ -55,13 +55,13 @@ public class PropagandaInfoDto { * 创建时间 */ @ApiModelProperty(value = "创建时间开始") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeStart; /** * 创建时间 */ @ApiModelProperty(value = "创建时间结束") - @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeEnd; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java new file mode 100644 index 00000000..ff289590 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java @@ -0,0 +1,92 @@ +package com.xinelu.manage.dto.propagandainfo; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @description: 宣教库保存传输对象 + * @author: haown + * @create: 2024-03-28 09:08 + **/ +@ApiModel("宣教库保存传输对象") +@Data +public class PropagandaInfoSaveDto { + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + @Excel(name = "所属医院名称") + private String hospitalAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** 宣教标题（宣教名称） */ + @ApiModelProperty(value = "宣教标题") + @Excel(name = "宣教标题", readConverterExp = "宣教名称") + private String propagandaTitle; + + /** 宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE， + 定制内容：CUSTOMIZED_CONTENT */ + @ApiModelProperty(value = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + @Excel(name = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + private String propagandaType; + + /** 宣教ID */ + @ApiModelProperty(value = "宣教ID") + private String propagandaCode; + + /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */ + @ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + @Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + private String propagandaStatus; + + /** 宣教正文内容 */ + @ApiModelProperty(value = "宣教正文内容") + private String propagandaContent; + + /** 宣教封面文件存放地址 */ + @ApiModelProperty(value = "宣教封面文件存放地址") + private String propagandaCoverPath; + + /** 宣教文章摘要 */ + @ApiModelProperty(value = "宣教文章摘要") + private String articleSummary; + + /** 语音播报 */ + @ApiModelProperty(value = "语音播报") + private String voicebroadcast; + + /** 所属病种id */ + @ApiModelProperty(value = "所属病种id") + private Long diseaseTypeId; + + /** 所属病种名称 */ + @ApiModelProperty(value = "所属病种名称") + @Excel(name = "所属病种名称") + private String diseaseTypeName; + + /** 宣教链接 */ + @ApiModelProperty(value = "宣教链接") + private String propagandaLink; + + /** 宣教二维码图片存放地址 */ + @ApiModelProperty(value = "宣教二维码图片存放地址") + private String propagandaBarcodePath; + + /** 所选素材对象列表 */ + @ApiModelProperty(value = "所选素材对象列表") + List materialsInfoList; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/IntentionalSignDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/IntentionalSignDto.java new file mode 100644 index 00000000..e92e9278 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/IntentionalSignDto.java @@ -0,0 +1,32 @@ +package com.xinelu.manage.dto.signpatientrecord; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotNull; +import lombok.Data; + +/** + * @description: 意向签约传输对象 + * @author: haown + * @create: 2024-03-28 16:51 + **/ +@ApiModel("意向签约传输对象") +@Data +public class IntentionalSignDto { + + @ApiModelProperty("患者信息表id") + @NotNull(message = "患者信息不能为空") + private Long patientId; + + @ApiModelProperty("开单医生id（意向签约）") + @NotNull(message = "开单医生不能为空") + private Long billingDoctorId; + + @ApiModelProperty("开单医生姓名（意向签约）") + @NotNull(message = "开单医生不能为空") + private String billingDoctorName; + + @ApiModelProperty("意向来源（意向签约，字典枚举）,DOCTOR_BILLING:医生开单") + @NotNull(message = "意向来源不能为空") + private String intentionalSource; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java index 8c3e27ad..4478d7d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java @@ -41,4 +41,7 @@ public class SignPatientAddDto { private List informeds; + @ApiModelProperty("签约类型，签约：sign, 续约：reSign") + private String signCategory; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java index 4487cd1e..0f90a271 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java @@ -1,10 +1,10 @@ package com.xinelu.manage.mapper.patientvisitrecord; -import org.apache.ibatis.annotations.Param; -import java.util.Collection; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import java.util.Collection; import java.util.List; +import org.apache.ibatis.annotations.Param; /** * 患者就诊记录基本信息Mapper接口 @@ -64,4 +64,12 @@ public interface PatientVisitRecordMapper { PatientVisitRecord judgeRepeat(@Param("hospitalAgencyId") Long hospitalAgencyId, @Param("cardNo") String cardNo, @Param("inHospitalNumber") String inHospitalNumber); + + /** + * 获取居民在当前机构最新一条就诊记录 + * @param hospitalAgencyId 机构id + * @param patientId 患者id + * @return 结果 + */ + PatientVisitRecord getLastRecord(@Param("hospitalAgencyId") Long hospitalAgencyId, @Param("patientId") Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java index 5684ed53..243dd006 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java @@ -4,6 +4,7 @@ import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; import com.xinelu.manage.vo.department.DepartmentVO; +import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import java.util.List; /** @@ -21,6 +22,14 @@ public interface PropagandaInfoMapper { */ public PropagandaInfo selectPropagandaInfoById(Long id); + /** + * 查询宣教素材信息 + * + * @param id 宣教库管理主键 + * @return 宣教库管理 + */ + PropagandaMaterialsVo selectPropagandaInfo(Long id); + /** * 查询宣教库管理列表 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java index 4527c6aa..9b6eaa91 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java @@ -35,6 +35,7 @@ public interface PropagandaMaterialsMapper { */ public int insertPropagandaMaterials(PropagandaMaterials propagandaMaterials); + /** * 修改宣教素材关系 * @@ -46,10 +47,26 @@ public interface PropagandaMaterialsMapper { /** * 删除宣教素材关系 * - * @param id 宣教素材关系主键 + * @param propagandaId 宣教库id * @return 结果 */ - public int deletePropagandaMaterialsById(Long id); + public int deleteByPropagandaId(Long propagandaId); + + /** + * 批量删除宣教素材关系 + * + * @param propagandaIds 宣教库id + * @return 结果 + */ + public int deleteByPropagandaIds(Long[] propagandaIds); + + /** + * 删除宣教素材关系 + * + * @param id 宣教素材关系 + * @return 结果 + */ + public int deletePropagandaMaterialsById(Long id); /** * 批量删除宣教素材关系 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java new file mode 100644 index 00000000..771126ec --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.residentinfo; + +import com.xinelu.manage.domain.residentinfo.ResidentInfo; +import java.util.List; + + +/** + * 居民信息Mapper接口 + * + * @author haown + * @date 2024-03-27 + */ +public interface ResidentInfoMapper { + /** + * 查询居民信息 + * + * @param id 居民信息主键 + * @return 居民信息 + */ + public ResidentInfo selectResidentInfoById(Long id); + + /** + * 查询居民信息列表 + * + * @param residentInfo 居民信息 + * @return 居民信息集合 + */ + List selectResidentInfoList(ResidentInfo residentInfo); + + /** + * 新增居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + int insertResidentInfo(ResidentInfo residentInfo); + + /** + * 修改居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + int updateResidentInfo(ResidentInfo residentInfo); + + /** + * 删除居民信息 + * + * @param id 居民信息主键 + * @return 结果 + */ + int deleteResidentInfoById(Long id); + + /** + * 批量删除居民信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteResidentInfoByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signroutetriggercondition/SignRouteTriggerConditionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signroutetriggercondition/SignRouteTriggerConditionMapper.java index 8f71ca95..0ca618e4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signroutetriggercondition/SignRouteTriggerConditionMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signroutetriggercondition/SignRouteTriggerConditionMapper.java @@ -1,4 +1,6 @@ package com.xinelu.manage.mapper.signroutetriggercondition; +import org.apache.ibatis.annotations.Param; +import java.util.Collection; import com.xinelu.manage.domain.signroutetriggercondition.SignRouteTriggerCondition; import java.util.List; @@ -58,4 +60,6 @@ public interface SignRouteTriggerConditionMapper { * @return 结果 */ public int deleteSignRouteTriggerConditionByIds(Long[] ids); + + int insertBatch(@Param("signRouteTriggerConditionCollection") Collection signRouteTriggerConditionCollection); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java index b1876df7..3216a2dd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java @@ -1,14 +1,17 @@ package com.xinelu.manage.service.materialsinfo.impl; +import com.xinelu.common.exception.ServiceException; import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto; import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; +import com.xinelu.manage.mapper.propagandamaterials.PropagandaMaterialsMapper; import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; /** * 素材信息Service业务层处理 @@ -20,6 +23,8 @@ import java.util.List; public class MaterialsInfoServiceImpl implements IMaterialsInfoService { @Resource private MaterialsInfoMapper materialsInfoMapper; + @Resource + private PropagandaMaterialsMapper propagandaMaterialsMapper; /** * 查询素材信息 @@ -75,6 +80,19 @@ public class MaterialsInfoServiceImpl implements IMaterialsInfoService { */ @Override public int deleteMaterialsInfoByIds(Long[] ids) { + // 查询素材是否被使用 + int used = 0; + for(Long id : ids) { + PropagandaMaterials queryObj = new PropagandaMaterials(); + queryObj.setMaterialsId(id); + List pmList = propagandaMaterialsMapper.selectPropagandaMaterialsList(queryObj); + if (CollectionUtils.isNotEmpty(pmList)) { + used++; + } + } + if (used > 0) { + throw new ServiceException("选中的素材已在宣教库中被占用不能删除"); + } return materialsInfoMapper.deleteMaterialsInfoByIds(ids); } @@ -86,6 +104,13 @@ public class MaterialsInfoServiceImpl implements IMaterialsInfoService { */ @Override public int deleteMaterialsInfoById(Long id) { - return materialsInfoMapper.deleteMaterialsInfoById(id); + PropagandaMaterials queryObj = new PropagandaMaterials(); + queryObj.setMaterialsId(id); + List pmList = propagandaMaterialsMapper.selectPropagandaMaterialsList(queryObj); + if (CollectionUtils.isNotEmpty(pmList)) { + throw new ServiceException("该素材已在宣教库中被使用不能删除"); + } else { + return materialsInfoMapper.deleteMaterialsInfoById(id); + } } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index bf8db962..2d4d5f7f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -33,7 +33,7 @@ public interface IPatientInfoService { * @param patientInfo 患者信息 * @return 结果 */ - public int insertPatientInfo(PatientInfo patientInfo); + PatientInfo insertPatientInfo(PatientInfo patientInfo); /** * 修改患者信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 7323e88f..89bc10e5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -1,14 +1,23 @@ package com.xinelu.manage.service.patientinfo.impl; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.domain.residentinfo.ResidentInfo; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; +import com.xinelu.manage.mapper.residentinfo.ResidentInfoMapper; import com.xinelu.manage.service.patientinfo.IPatientInfoService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; +import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import java.time.LocalDateTime; import java.util.List; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 患者信息Service业务层处理 @@ -21,6 +30,10 @@ public class PatientInfoServiceImpl implements IPatientInfoService { @Resource private PatientInfoMapper patientInfoMapper; + @Resource + private ResidentInfoMapper residentInfoMapper; + @Resource + private IPatientVisitRecordService patientVisitRecordService; /** * 查询患者信息 @@ -51,10 +64,30 @@ public class PatientInfoServiceImpl implements IPatientInfoService { * @return 结果 */ @Override - public int insertPatientInfo(PatientInfo patientInfo) { - patientInfo.setCreateTime(LocalDateTime.now()); - patientInfo.setDelFlag(0); - return patientInfoMapper.insertPatientInfo(patientInfo); + @Transactional + public PatientInfo insertPatientInfo(PatientInfo patientInfo) { + patientInfo.setCreateTime(LocalDateTime.now()); + patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + patientInfo.setDelFlag(0); + // 根据身份证号查询是否有该居民 + ResidentInfo residentQuery = new ResidentInfo(); + residentQuery.setCardNo(patientInfo.getCardNo()); + List residentList = residentInfoMapper.selectResidentInfoList(residentQuery); + + ResidentInfo residentInfo = new ResidentInfo(); + BeanUtils.copyBeanProp(residentInfo, patientInfo); + if (CollectionUtils.isEmpty(residentList)) { + // 新增居民 + residentInfoMapper.insertResidentInfo(residentInfo); + patientInfo.setResidentId(residentInfo.getId()); + } else { + // 修改居民信息 + residentInfo.setId(residentList.get(0).getId()); + residentInfoMapper.updateResidentInfo(residentInfo); + patientInfo.setResidentId(residentList.get(0).getId()); + } + patientInfoMapper.insertPatientInfo(patientInfo); + return patientInfo; } /** @@ -65,8 +98,14 @@ public class PatientInfoServiceImpl implements IPatientInfoService { */ @Override public int updatePatientInfo(PatientInfo patientInfo) { + patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setUpdateTime(LocalDateTime.now()); - return patientInfoMapper.updatePatientInfo(patientInfo); + patientInfo.setDelFlag(0); + patientInfoMapper.updatePatientInfo(patientInfo); + ResidentInfo residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); + BeanUtils.copyBeanProp(residentInfo, patientInfo); + residentInfo.setId(patientInfo.getResidentId()); + return residentInfoMapper.updateResidentInfo(residentInfo); } /** @@ -76,12 +115,49 @@ public class PatientInfoServiceImpl implements IPatientInfoService { * @return 结果 */ @Override + @Transactional public int deletePatientInfoByIds(Long[] ids) { + for (Long id : ids) { + PatientInfo patientInfo = patientInfoMapper.selectPatientInfoById(id); + patientVisitRecordService.deletePatientVisitRecordById(patientInfo.getPatientVisitRecordId()); + // 根据患者最新一条就诊记录修改患者状态 + PatientVisitRecordDto patientVisitRecordDto = new PatientVisitRecordDto(); + patientVisitRecordDto.setPatientId(id); + PatientVisitRecord patientVisitRecord = patientVisitRecordService.getLastRecord(patientInfo.getHospitalAgencyId(), id); + if (ObjectUtils.isEmpty(patientVisitRecord)) { + setVisitInfoNull(patientInfo); + } else { + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + patientInfo.setId(id); + patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); + // 设置patientType + patientVisitRecordService.setPatientType(patientInfo, patientVisitRecord); + } + patientInfoMapper.updatePatientInfo(patientInfo); + } return patientInfoMapper.deletePatientInfoByIds(ids); } + /** + * 设置患者就诊信息为空 + * @param patientInfo 患者信息 + */ + private void setVisitInfoNull(PatientInfo patientInfo){ + patientInfo.setVisitDate(null); + patientInfo.setPatientType(null); + patientInfo.setPatientVisitRecordId(null); + patientInfo.setVisitMethod(null); + patientInfo.setAdmissionDate(null); + patientInfo.setDischargeDate(null); + patientInfo.setAttendingPhysicianId(null); + patientInfo.setAttendingPhysicianName(null); + patientInfo.setResponsibleNurse(null); + patientInfo.setMainDiagnosis(null); + patientInfo.setVisitSerialNumber(null); + patientInfo.setInHospitalNumber(null); + } /** - * 删除患者信息信息 + * 删除患者信息 * * @param id 患者信息主键 * @return 结果 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index ec91d84a..5c9561c2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -12,12 +12,14 @@ import com.xinelu.manage.domain.agency.Agency; import com.xinelu.manage.domain.department.Department; import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.patientprehospitalization.PatientPreHospitalization; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.mapper.agency.AgencyMapper; import com.xinelu.manage.mapper.department.DepartmentMapper; -import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientprehospitalization.PatientPreHospitalizationMapper; +import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.service.patientprehospitalization.IPatientPreHospitalizationService; +import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -41,7 +43,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital private PatientPreHospitalizationMapper preHospitalizationMapper; @Resource - private PatientInfoMapper patientInfoMapper; + private IPatientInfoService patientInfoService; @Resource private AgencyMapper agencyMapper; @@ -49,6 +51,9 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital @Resource private DepartmentMapper departmentMapper; + @Resource + private IPatientVisitRecordService patientVisitRecordService; + @Resource private RegexUtil regexUtil; @@ -58,27 +63,23 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital PatientInfoDto patientInfoDto = new PatientInfoDto(); patientInfoDto.setCardNo(preHospitalization.getCardNo()); patientInfoDto.setHospitalAgencyId(preHospitalization.getHospitalAgencyId()); - List patientList = patientInfoMapper.selectPatientInfoList(patientInfoDto); + List patientList = patientInfoService.selectPatientInfoList(patientInfoDto); if (CollectionUtils.isEmpty(patientList)) { // 保存患者信息 PatientInfo patientInfo = new PatientInfo(); BeanUtils.copyBeanProp(patientInfo, preHospitalization); - patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientInfo.setCreateTime(LocalDateTime.now()); - patientInfo.setDelFlag(0); patientInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); - patientInfoMapper.insertPatientInfo(patientInfo); - preHospitalization.setPatientId(patientInfo.getId()); + PatientInfo saveObj = patientInfoService.insertPatientInfo(patientInfo); + preHospitalization.setPatientId(saveObj.getId()); + preHospitalization.setResidentId(saveObj.getResidentId()); } else { // 修改患者信息 PatientInfo patientInfo = patientList.get(0); BeanUtils.copyBeanProp(patientInfo, preHospitalization); - patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientInfo.setUpdateTime(LocalDateTime.now()); - patientInfo.setDelFlag(0); patientInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); - patientInfoMapper.updatePatientInfo(patientInfo); - preHospitalization.setPatientId(patientList.get(0).getId()); + patientInfoService.updatePatientInfo(patientInfo); + preHospitalization.setPatientId(patientInfo.getId()); + preHospitalization.setResidentId(patientInfo.getResidentId()); } // 保存预住院信息 preHospitalization.setDelFlag(0); @@ -93,22 +94,40 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } @Override + @Transactional public int update(PatientPreHospitalization preHospitalization) { // 修改患者信息 - PatientInfo patientInfo = patientInfoMapper.selectPatientInfoById(preHospitalization.getPatientId()); + PatientInfo patientInfo = patientInfoService.selectPatientInfoById(preHospitalization.getPatientId()); Long patientId = patientInfo.getId(); BeanUtils.copyBeanProp(patientInfo, preHospitalization); patientInfo.setId(patientId); - int flag = patientInfoMapper.updatePatientInfo(patientInfo); + int flag = patientInfoService.updatePatientInfo(patientInfo); if (flag >= 0) { return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); } - return -1; + return flag; } @Override + @Transactional public int deleteByIds(Long[] ids) { + for (Long id : ids) { + // 将患者状态还原为上一个状态 + PatientPreHospitalization patientPreHospitalization = preHospitalizationMapper.selectByPrimaryKey(id); + PatientInfo patientInfo = patientInfoService.selectPatientInfoById(patientPreHospitalization.getPatientId()); + PatientVisitRecord patientVisitRecord = patientVisitRecordService.getLastRecord(patientPreHospitalization.getHospitalAgencyId(), patientPreHospitalization.getPatientId()); + if (ObjectUtils.isEmpty(patientVisitRecord)) { + // 患者的预住院信息置空 + setPreHospitalizationInfoNull(patientInfo); + } else { + // 将患者信息更改为就诊信息 + BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); + patientVisitRecordService.setPatientType(patientInfo, patientVisitRecord); + } + patientInfoService.updatePatientInfo(patientInfo); + } return preHospitalizationMapper.deleteByIds(ids); } @@ -184,7 +203,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital PatientInfoDto patientQuery = new PatientInfoDto(); patientQuery.setCardNo(item.getCardNo()); patientQuery.setHospitalAgencyId(preHospitalization.getHospitalAgencyId()); - List patientInfoList = patientInfoMapper.selectPatientInfoList(patientQuery); + List patientInfoList = patientInfoService.selectPatientInfoList(patientQuery); if (CollectionUtils.isNotEmpty(patientInfoList)) { // 修改居民信息 PatientInfo updInfo = patientInfoList.get(0); @@ -192,16 +211,18 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital BeanUtils.copyProperties(preHospitalization,updInfo, ignore); updInfo.setVisitDate(preHospitalization.getRegistrationDate().atStartOfDay()); updInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); - patientInfoMapper.updatePatientInfo(updInfo); - preHospitalization.setPatientId(patientInfoList.get(0).getId()); + patientInfoService.updatePatientInfo(updInfo); + preHospitalization.setPatientId(updInfo.getId()); + preHospitalization.setResidentId(updInfo.getResidentId()); } else { PatientInfo saveInfo = new PatientInfo(); // 添加居民 BeanUtils.copyProperties(preHospitalization, saveInfo); saveInfo.setVisitDate(preHospitalization.getRegistrationDate().atStartOfDay()); saveInfo.setPatientType(PatientTypeConstants.PRE_HOSPITALIZED_PATIENT); - patientInfoMapper.insertPatientInfo(saveInfo); - preHospitalization.setPatientId(saveInfo.getId()); + PatientInfo patientInfo = patientInfoService.insertPatientInfo(saveInfo); + preHospitalization.setPatientId(patientInfo.getId()); + preHospitalization.setResidentId(patientInfo.getResidentId()); } // 根据患者身份证号和预约时间查询是否有记录 PatientPreHospitalization preHospitalizationQuery = new PatientPreHospitalization(); @@ -222,4 +243,10 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } return AjaxResult.success(); } + + private void setPreHospitalizationInfoNull(PatientInfo patientInfo) { + patientInfo.setAppointmentDate(null); + patientInfo.setAppointmentTreatmentGroup(null); + patientInfo.setPatientType(null); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java index 29c0f088..79679242 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.patientvisitrecord; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2024-02-26 */ public interface IPatientVisitRecordService { + /** * 查询患者就诊记录基本信息 * @@ -86,4 +88,8 @@ public interface IPatientVisitRecordService { * @return int **/ AjaxResult importPatientList(List patientList, String patientType); + + void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord); + + PatientVisitRecord getLastRecord(Long hospitalAgencyId,Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 23fe1cc9..5bde993b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -24,6 +24,7 @@ import com.xinelu.manage.mapper.agency.AgencyMapper; import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; +import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo; import java.time.LocalDateTime; @@ -58,8 +59,10 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService private DepartmentMapper departmentMapper; @Resource private PatientInfoMapper patientInfoMapper; + @Resource + private IPatientInfoService patientInfoService; - /** + /** * 查询患者就诊记录基本信息 * * @param id 患者就诊记录基本信息主键 @@ -91,7 +94,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Transactional(rollbackFor = Exception.class) public void insertPatientVisitRecord(PatientVisitRecordSaveDto saveDto) { // 根据机构id、患者身份证号判断门诊/住院号是否重复 - PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), saveDto.getCardNo(), saveDto.getInHospitalNumber()); + PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), null, saveDto.getInHospitalNumber()); if (ObjectUtils.isNotEmpty(patientVisitRecord)) { throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); } @@ -101,28 +104,28 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 1、保存患者信息-查询是否有患者档案 PatientInfoDto patientInfoDto = new PatientInfoDto(); patientInfoDto.setHospitalAgencyId(saveBody.getHospitalAgencyId()); - patientInfoDto.setCardNo(patientInfoDto.getCardNo()); + patientInfoDto.setCardNo(saveBody.getCardNo()); List patientInfoList = patientInfoMapper.selectPatientInfoList(patientInfoDto); // 患者档案信息新增/修改 PatientInfo patientInfo = new PatientInfo(); if(CollectionUtils.isEmpty(patientInfoList)) { // 新增档案 - BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + BeanUtils.copyBeanProp(patientInfo, saveDto); patientInfo.setPatientSource(PatientSourceEnum.MANAGE_END.name()); patientInfo.setDelFlag(0); patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setCreateTime(LocalDateTime.now()); - patientInfoMapper.insertPatientInfo(patientInfo); + patientInfoService.insertPatientInfo(patientInfo); saveBody.setPatientId(patientInfo.getId()); } else { patientInfo = patientInfoList.get(0); Long patientId = patientInfo.getId(); // 修改档案 - BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); + BeanUtils.copyBeanProp(patientInfo, saveDto); patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setUpdateTime(LocalDateTime.now()); patientInfo.setId(patientId); - patientInfoMapper.updatePatientInfo(patientInfo); + patientInfoService.updatePatientInfo(patientInfo); saveBody.setPatientId(patientId); } // 保存/修改就诊记录 @@ -163,7 +166,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService PatientInfo patientInfo = patientMapper.selectPatientInfoById(patientVisitRecord.getPatientId()); setVisitDate(patientVisitRecord); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); - patientMapper.updatePatientInfo(patientInfo); + patientInfoService.updatePatientInfo(patientInfo); // 修改就诊记录信息 return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); } @@ -193,7 +196,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 设置患者类型 setPatientType(patientInfo, patientVisitRecord); patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); - patientMapper.updatePatientInfo(patientInfo); + patientInfoService.updatePatientInfo(patientInfo); } return flag; } @@ -225,7 +228,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientInfo.setDepartmentId(updDto.getDepartmentId()); patientInfo.setDepartmentName(updDto.getDepartmentName()); setPatientType(patientInfo, patientVisitRecord); - patientMapper.updatePatientInfo(patientInfo); + patientInfoService.updatePatientInfo(patientInfo); } return flag; } @@ -381,18 +384,8 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService return AjaxResult.success(); } - private void setVisitDate(PatientVisitRecord patientVisitRecord) { - if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { - patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime()); - } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { - // 住院时间，出院时间-入院时间 - long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime()); - patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); - patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime()); - } - } - - private void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { + @Override + public void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { // 住院患者：有出院时间，设置患者类型为出院，没有出院时间，设置患者类型为在院 if (patientVisitRecord.getDischargeTime() == null) { @@ -404,4 +397,19 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientInfo.setPatientType(PatientTypeConstants.OUTPATIENT); } } + + @Override public PatientVisitRecord getLastRecord(Long hospitalAgencyId, Long patientId) { + return patientVisitRecordMapper.getLastRecord(hospitalAgencyId, patientId); + } + + private void setVisitDate(PatientVisitRecord patientVisitRecord) { + if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { + patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime()); + } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { + // 住院时间，出院时间-入院时间 + long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime()); + patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); + patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime()); + } + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java index 2d1294ec..d6d8d0b6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java @@ -3,8 +3,10 @@ package com.xinelu.manage.service.propagandainfo; import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoSaveDto; import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; import com.xinelu.manage.vo.department.DepartmentVO; +import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import java.util.List; /** @@ -20,7 +22,7 @@ public interface IPropagandaInfoService { * @param id 宣教库管理主键 * @return 宣教库管理 */ - public PropagandaInfo selectPropagandaInfoById(Long id); + public PropagandaMaterialsVo selectPropagandaInfoById(Long id); /** * 查询宣教库管理列表 @@ -33,18 +35,18 @@ public interface IPropagandaInfoService { /** * 新增宣教库管理 * - * @param propagandaInfo 宣教库管理 + * @param propagandaInfoSaveDto 宣教库保存传输对象 * @return 结果 */ - public int insertPropagandaInfo(PropagandaInfo propagandaInfo); + public int insertPropagandaInfo(PropagandaInfoSaveDto propagandaInfoSaveDto); /** * 修改宣教库管理 * - * @param propagandaInfo 宣教库管理 + * @param propagandaInfoSaveDto 宣教库管理 * @return 结果 */ - public int updatePropagandaInfo(PropagandaInfo propagandaInfo); + public int updatePropagandaInfo(PropagandaInfoSaveDto propagandaInfoSaveDto); /** * 复制宣教库管理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java index c909d409..d57c0f7f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java @@ -1,18 +1,26 @@ package com.xinelu.manage.service.propagandainfo.impl; import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.bean.BeanUtils; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; import com.xinelu.manage.dto.department.DepartmentDTO; import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoSaveDto; import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; +import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper; +import com.xinelu.manage.mapper.propagandamaterials.PropagandaMaterialsMapper; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.manage.vo.department.DepartmentVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; +import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import java.time.LocalDateTime; import java.util.List; +import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 宣教库管理Service业务层处理 @@ -24,6 +32,10 @@ import java.util.List; public class PropagandaInfoServiceImpl implements IPropagandaInfoService { @Resource private PropagandaInfoMapper propagandaInfoMapper; + @Resource + private PropagandaMaterialsMapper propagandaMaterialsMapper; + @Resource + private MaterialsInfoMapper materialsInfoMapper; /** * 查询宣教库管理 @@ -32,8 +44,8 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { * @return 宣教库管理 */ @Override - public PropagandaInfo selectPropagandaInfoById(Long id) { - return propagandaInfoMapper.selectPropagandaInfoById(id); + public PropagandaMaterialsVo selectPropagandaInfoById(Long id) { + return propagandaInfoMapper.selectPropagandaInfo(id); } /** @@ -50,38 +62,100 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { /** * 新增宣教库管理 * - * @param propagandaInfo 宣教库管理 + * @param propagandaInfoSaveDto 宣教库保存传输对象 * @return 结果 */ @Override - public int insertPropagandaInfo(PropagandaInfo propagandaInfo) { + @Transactional + public int insertPropagandaInfo(PropagandaInfoSaveDto propagandaInfoSaveDto) { + PropagandaInfo propagandaInfo = new PropagandaInfo(); + BeanUtils.copyBeanProp(propagandaInfo, propagandaInfoSaveDto); + propagandaInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); propagandaInfo.setCreateTime(LocalDateTime.now()); - return propagandaInfoMapper.insertPropagandaInfo(propagandaInfo); + propagandaInfo.setDelFlag(0); + int flag = propagandaInfoMapper.insertPropagandaInfo(propagandaInfo); + if (flag > 0) { + // 保存宣教素材关联关系 + if (CollectionUtils.isNotEmpty(propagandaInfoSaveDto.getMaterialsInfoList())) { + for (MaterialsInfo materialsInfo : propagandaInfoSaveDto.getMaterialsInfoList()) { + PropagandaMaterials propagandaMaterials = new PropagandaMaterials(); + propagandaMaterials.setPropagandaId(propagandaInfo.getId()); + propagandaMaterials.setPropagandaTitle(propagandaInfo.getPropagandaTitle()); + propagandaMaterials.setMaterialsId(materialsInfo.getId()); + propagandaMaterials.setMaterialsName(materialsInfo.getMaterialsName()); + propagandaMaterials.setCreateTime(LocalDateTime.now()); + propagandaMaterials.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + propagandaMaterials.setDelFlag(0); + propagandaMaterialsMapper.insertPropagandaMaterials(propagandaMaterials); + } + } + } + return flag; } /** * 修改宣教库管理 * - * @param propagandaInfo 宣教库管理 + * @param propagandaInfoSaveDto 宣教库管理 * @return 结果 */ @Override - public int updatePropagandaInfo(PropagandaInfo propagandaInfo) { + public int updatePropagandaInfo(PropagandaInfoSaveDto propagandaInfoSaveDto) { + PropagandaInfo propagandaInfo = new PropagandaInfo(); + BeanUtils.copyBeanProp(propagandaInfo, propagandaInfoSaveDto); + propagandaInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); propagandaInfo.setUpdateTime(LocalDateTime.now()); - return propagandaInfoMapper.updatePropagandaInfo(propagandaInfo); + int flag = propagandaInfoMapper.updatePropagandaInfo(propagandaInfo); + if (flag > 0) { + // 删除之前的关联关系 + propagandaMaterialsMapper.deleteByPropagandaId(propagandaInfo.getId()); + // 修改宣教素材关联关系 + if (CollectionUtils.isNotEmpty(propagandaInfoSaveDto.getMaterialsInfoList())) { + for (MaterialsInfo materialsInfo : propagandaInfoSaveDto.getMaterialsInfoList()) { + PropagandaMaterials propagandaMaterials = new PropagandaMaterials(); + propagandaMaterials.setPropagandaId(propagandaInfo.getId()); + propagandaMaterials.setPropagandaTitle(propagandaInfo.getPropagandaTitle()); + propagandaMaterials.setMaterialsId(materialsInfo.getId()); + propagandaMaterials.setMaterialsName(materialsInfo.getMaterialsName()); + propagandaMaterials.setCreateTime(LocalDateTime.now()); + propagandaMaterials.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + propagandaMaterials.setDelFlag(0); + propagandaMaterialsMapper.insertPropagandaMaterials(propagandaMaterials); + } + } + } + return flag; } @Override public int copyPropagandaInfo(Long id) { PropagandaInfo propagandaInfo = propagandaInfoMapper.selectPropagandaInfoById(id); propagandaInfo.setId(null); + propagandaInfo.setDelFlag(0); propagandaInfo.setCreateTime(LocalDateTime.now()); propagandaInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); propagandaInfo.setUpdateTime(null); propagandaInfo.setUpdateBy(null); - propagandaInfo.setPropagandaCode(propagandaInfo.getPropagandaCode() + "-COPY"); + propagandaInfo.setPropagandaCode(propagandaInfo.getPropagandaCode().replaceAll("-COPY", "") + "-COPY"); propagandaInfo.setPropagandaStatus("CREATE_COMPLETE"); - return propagandaInfoMapper.insertPropagandaInfo(propagandaInfo); + int flag = propagandaInfoMapper.insertPropagandaInfo(propagandaInfo); + if (flag > 0) { + // 查询宣教素材关联关系 + PropagandaMaterials query = new PropagandaMaterials(); + query.setPropagandaId(id); + List propagandaMaterialsList = propagandaMaterialsMapper.selectPropagandaMaterialsList(query); + if (CollectionUtils.isNotEmpty(propagandaMaterialsList)) { + for (PropagandaMaterials propagandaMaterials : propagandaMaterialsList) { + propagandaMaterials.setPropagandaId(id); + propagandaMaterials.setPropagandaTitle(propagandaInfo.getPropagandaTitle()); + propagandaMaterials.setDelFlag(0); + propagandaMaterials.setCreateBy(SecurityUtils.getLoginUser().getUser().getCreateBy()); + propagandaMaterials.setCreateTime(LocalDateTime.now()); + propagandaMaterialsMapper.insertPropagandaMaterials(propagandaMaterials); + } + } + } + return flag; } @Override @@ -100,6 +174,8 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { */ @Override public int deletePropagandaInfoByIds(Long[] ids) { + // 删除宣教素材关系 + propagandaMaterialsMapper.deleteByPropagandaIds(ids); return propagandaInfoMapper.deletePropagandaInfoByIds(ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/IResidentInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/IResidentInfoService.java new file mode 100644 index 00000000..6e9d4bfb --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/IResidentInfoService.java @@ -0,0 +1,60 @@ +package com.xinelu.manage.service.residentinfo; + +import com.xinelu.manage.domain.residentinfo.ResidentInfo; +import java.util.List; + +/** + * 居民信息Service接口 + * + * @author haown + * @date 2024-03-27 + */ +public interface IResidentInfoService { + /** + * 查询居民信息 + * + * @param id 居民信息主键 + * @return 居民信息 + */ + public ResidentInfo selectResidentInfoById(Long id); + + /** + * 查询居民信息列表 + * + * @param residentInfo 居民信息 + * @return 居民信息集合 + */ + List selectResidentInfoList(ResidentInfo residentInfo); + + /** + * 新增居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + int insertResidentInfo(ResidentInfo residentInfo); + + /** + * 修改居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + int updateResidentInfo(ResidentInfo residentInfo); + + /** + * 批量删除居民信息 + * + * @param ids 需要删除的居民信息主键集合 + * @return 结果 + */ + int deleteResidentInfoByIds(Long[] ids); + + /** + * 删除居民信息信息 + * + * @param id 居民信息主键 + * @return 结果 + */ + int deleteResidentInfoById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/impl/ResidentInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/impl/ResidentInfoServiceImpl.java new file mode 100644 index 00000000..a7697cf2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/residentinfo/impl/ResidentInfoServiceImpl.java @@ -0,0 +1,81 @@ +package com.xinelu.manage.service.residentinfo.impl; + +import com.xinelu.manage.domain.residentinfo.ResidentInfo; +import com.xinelu.manage.mapper.residentinfo.ResidentInfoMapper; +import com.xinelu.manage.service.residentinfo.IResidentInfoService; +import java.time.LocalDateTime; +import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 居民信息Service业务层处理 + * + * @author haown + * @date 2024-03-27 + */ +@Service public class ResidentInfoServiceImpl implements IResidentInfoService { + @Resource private ResidentInfoMapper residentInfoMapper; + + /** + * 查询居民信息 + * + * @param id 居民信息主键 + * @return 居民信息 + */ + @Override public ResidentInfo selectResidentInfoById(Long id) { + return residentInfoMapper.selectResidentInfoById(id); + } + + /** + * 查询居民信息列表 + * + * @param residentInfo 居民信息 + * @return 居民信息 + */ + @Override public List selectResidentInfoList(ResidentInfo residentInfo) { + return residentInfoMapper.selectResidentInfoList(residentInfo); + } + + /** + * 新增居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + @Override public int insertResidentInfo(ResidentInfo residentInfo) { + residentInfo.setCreateTime(LocalDateTime.now()); + return residentInfoMapper.insertResidentInfo(residentInfo); + } + + /** + * 修改居民信息 + * + * @param residentInfo 居民信息 + * @return 结果 + */ + @Override public int updateResidentInfo(ResidentInfo residentInfo) { + residentInfo.setUpdateTime(LocalDateTime.now()); + return residentInfoMapper.updateResidentInfo(residentInfo); + } + + /** + * 批量删除居民信息 + * + * @param ids 需要删除的居民信息主键 + * @return 结果 + */ + @Override public int deleteResidentInfoByIds(Long[] ids) { + return residentInfoMapper.deleteResidentInfoByIds(ids); + } + + /** + * 删除居民信息信息 + * + * @param id 居民信息主键 + * @return 结果 + */ + @Override public int deleteResidentInfoById(Long id) { + return residentInfoMapper.deleteResidentInfoById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java index b02f1a62..48ae71d7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java @@ -1,11 +1,12 @@ package com.xinelu.manage.service.signpatientrecord; -import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; +import com.xinelu.manage.dto.signpatientrecord.IntentionalSignDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; -import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; import java.util.List; /** @@ -38,4 +39,11 @@ public interface ISignPatientRecordService { int add(SignPatientAddDto body); int updateSignStatus(SignPatientStatusDto patientCancelSignDto); + + /** + * 意向签约 + * @param intentionalSignDto 意向签约传输对象 + * @return + */ + int intentionalSign(IntentionalSignDto intentionalSignDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index e69194cc..b8d584d2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -13,10 +13,12 @@ import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRout import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; +import com.xinelu.manage.domain.signroutetriggercondition.SignRouteTriggerCondition; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; import com.xinelu.manage.dto.signpatientpackage.SignPatientPackageSaveDto; +import com.xinelu.manage.dto.signpatientrecord.IntentionalSignDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; @@ -27,6 +29,7 @@ import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRout import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper; import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; +import com.xinelu.manage.mapper.signroutetriggercondition.SignRouteTriggerConditionMapper; import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; @@ -76,6 +79,8 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { private SignPatientManageRouteNodeMapper manageRouteNodeMapper; @Resource private SpecialDiseaseTriggerConditionMapper triggerConditionMapper; + @Resource + private SignRouteTriggerConditionMapper signRouteTriggerConditionMapper; @Override public List selectList(SignPatientListDto signPatientRecord) { return signPatientRecordMapper.selectList(signPatientRecord); @@ -112,7 +117,6 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { } if (ObjectUtils.isNotEmpty(body.getRecord())) { SignPatientRecord signPatientRecord = body.getRecord(); - signPatientRecord.setId(null); if (signPatientRecord.getPatientId() == null) { throw new ServiceException("请选择签约居民"); } @@ -129,8 +133,13 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signPatientRecord.setCreateTime(LocalDateTime.now()); signPatientRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); // 保存签约记录 - int flag = signPatientRecordMapper.insert(signPatientRecord); - + int flag = 0; + if (body.getSignCategory() == "sign") { + flag = signPatientRecordMapper.updateByPrimaryKey(signPatientRecord); + } else { + signPatientRecord.setId(null); + flag = signPatientRecordMapper.insert(signPatientRecord); + } // 签约信息保存到患者表 patient.setSignPatientRecordId(signPatientRecord.getId()); patient.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); @@ -157,6 +166,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { SignPatientManageRoute signPatientManageRoute = new SignPatientManageRoute(); BeanUtils.copyBeanProp(signPatientManageRoute, specialDiseaseRoute); signPatientManageRoute.setSignPatientRecordId(signPatientRecord.getId()); + signPatientManageRoute.setId(null); signPatientManageRoute.setRouteId(specialDiseaseRoute.getId()); signPatientManageRoute.setTaskCreateType(TaskCreateTypeConstant.MANUAL_MATCHE); signPatientManageRoute.setCreateTime(LocalDateTime.now()); @@ -173,6 +183,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { SignPatientManageRouteNode manageRouteNode = new SignPatientManageRouteNode(); BeanUtils.copyBeanProp(manageRouteNode, node); manageRouteNode.setManageRouteId(body.getRouteId()); + manageRouteNode.setId(null); manageRouteNode.setCreateTime(LocalDateTime.now()); manageRouteNode.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); return manageRouteNode; @@ -183,9 +194,14 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { SpecialDiseaseTriggerCondition triggerConditionQuery = new SpecialDiseaseTriggerCondition(); triggerConditionQuery.setRouteId(body.getRouteId()); List triggerConditions = triggerConditionMapper.selectSpecialDiseaseTriggerConditionList(triggerConditionQuery); - //triggerConditions.stream().map(item->{ - // - //}) + List routeTriggerConditionList = triggerConditions.stream().map(item->{ + SignRouteTriggerCondition signRouteTriggerCondition = new SignRouteTriggerCondition(); + BeanUtils.copyBeanProp(signRouteTriggerCondition, item); + signRouteTriggerCondition.setPatientManageRouteId(signPatientManageRoute.getRouteId()); + signRouteTriggerCondition.setId(null); + return signRouteTriggerCondition; + }).collect(Collectors.toList()); + signRouteTriggerConditionMapper.insertBatch(routeTriggerConditionList); } // 保存硬件 @@ -235,4 +251,35 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { return signPatientRecordMapper.updateByPrimaryKeySelective(signRecord); } + @Override + @Transactional(rollbackFor = Exception.class) + public int intentionalSign(IntentionalSignDto intentionalSignDto) { + PatientInfo patientInfo = patientInfoMapper.selectPatientInfoById(intentionalSignDto.getPatientId()); + if (ObjectUtils.isEmpty(patientInfo)) { + throw new ServiceException("未找到该居民"); + } + // 查询当前居民签约状态是否已签约 + if (StringUtils.equals(SignRecordServiceStatusConstants.IN_SIGN, patientInfo.getSignStatus())) { + throw new ServiceException("该居民已签约!"); + } + + patientInfo.setServiceStatus(SignRecordServiceStatusConstants.INTENTIONAL_SIGNING); + SignPatientRecord signRecord = new SignPatientRecord(); + // 患者信息保存到签约表 + BeanUtils.copyBeanProp(signRecord, patientInfo); + signRecord.setSignDiagnosis(patientInfo.getMainDiagnosis()); + signRecord.setBillingDoctorId(intentionalSignDto.getBillingDoctorId()); + signRecord.setBillingDoctorName(intentionalSignDto.getBillingDoctorName()); + signRecord.setIntentionalSource(intentionalSignDto.getIntentionalSource()); + signRecord.setIntentionalTime(LocalDateTime.now()); + signRecord.setPatientId(patientInfo.getId()); + signRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + signRecord.setCreateTime(LocalDateTime.now()); + int flag = signPatientRecordMapper.insertSelective(signRecord); + if (flag > 0) { + patientInfo.setSignPatientRecordId(signRecord.getId()); + patientInfoMapper.updatePatientInfo(patientInfo); + } + return flag; + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java index 3e6cf154..d32f008a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientBaseInfoVo.java @@ -16,6 +16,10 @@ public class PatientBaseInfoVo { /** 主键id */ private Long id; + /** 居民信息表id */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; + /** 患者姓名 */ @ApiModelProperty(value = "患者姓名") @Excel(name = "患者姓名") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/propagandainfo/PropagandaMaterialsVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/propagandainfo/PropagandaMaterialsVo.java new file mode 100644 index 00000000..d7f8f402 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/propagandainfo/PropagandaMaterialsVo.java @@ -0,0 +1,94 @@ +package com.xinelu.manage.vo.propagandainfo; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import lombok.Data; + +/** + * @description: 宣教对象查询返回视图类 + * @author: haown + * @create: 2024-03-28 10:50 + **/ +@ApiModel("宣教对象查询返回视图类") +@Data +public class PropagandaMaterialsVo { + /** 主键id */ + private Long id; + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + @Excel(name = "所属医院名称") + private String hospitalAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** 宣教标题（宣教名称） */ + @ApiModelProperty(value = "宣教标题") + @Excel(name = "宣教标题", readConverterExp = "宣=教名称") + private String propagandaTitle; + + /** 宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE， + 定制内容：CUSTOMIZED_CONTENT */ + @ApiModelProperty(value = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + @Excel(name = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + private String propagandaType; + + /** 宣教ID */ + @ApiModelProperty(value = "宣教ID") + private String propagandaCode; + + /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */ + @ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + @Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + private String propagandaStatus; + + /** 宣教正文内容 */ + @ApiModelProperty(value = "宣教正文内容") + private String propagandaContent; + + /** 宣教封面文件存放地址 */ + @ApiModelProperty(value = "宣教封面文件存放地址") + private String propagandaCoverPath; + + /** 宣教文章摘要 */ + @ApiModelProperty(value = "宣教文章摘要") + private String articleSummary; + + /** 语音播报 */ + @ApiModelProperty(value = "语音播报") + private String voicebroadcast; + + /** 所属病种id */ + @ApiModelProperty(value = "所属病种id") + private Long diseaseTypeId; + + /** 所属病种名称 */ + @ApiModelProperty(value = "所属病种名称") + @Excel(name = "所属病种名称") + private String diseaseTypeName; + + /** 宣教链接 */ + @ApiModelProperty(value = "宣教链接") + private String propagandaLink; + + /** 宣教二维码图片存放地址 */ + @ApiModelProperty(value = "宣教二维码图片存放地址") + private String propagandaBarcodePath; + + @ApiModelProperty("关联的素材列表") + List materialsInfoList; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml index 59e6dbaf..217eb8e0 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml @@ -24,6 +24,7 @@ + @@ -31,12 +32,13 @@ - select id, materials_name, materials_type, materials_option, materials_file_path, video_cover_type, video_cover_file_path, materials_abstract, indications, applicable_diseases, drug_name, surgical_name, check_items, inspection_items, crowd_id, crow_name, materials_status, materials_remark, materials_sort, create_by, create_time, update_by, update_time from materials_info + select id, materials_name, materials_type, materials_option, materials_file_path, video_cover_type, video_cover_file_path, materials_abstract, indications, applicable_diseases, drug_name, surgical_name, check_items, inspection_items, crowd_id, crow_name, materials_status, materials_remark, materials_sort, del_flag, create_by, create_time, update_by, update_time from materials_info select from patient_pre_hospitalization - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} - - delete from patient_pre_hospitalization - where id = #{id,jdbcType=BIGINT} - - - insert into patient_pre_hospitalization - ( id,patient_id,patient_name - ,patient_phone,card_no,sex - ,birth_date,family_member_phone,address - ,main_diagnosis,hospital_agency_id,hospital_agency_name - ,campus_agency_id,campus_agency_name,department_id - ,department_name,ward_id,ward_name - ,appointment_treatment_group,registration_no,registration_date - ,appointment_date,certificate_issuing_doctor_id,certificate_issuing_doctor_name - ,responsible_nurse,del_flag,create_by - ,create_time,update_by,update_time - ) - values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{patientPhone,jdbcType=VARCHAR},#{cardNo,jdbcType=VARCHAR},#{sex,jdbcType=VARCHAR} - ,#{birthDate,jdbcType=DATE},#{familyMemberPhone,jdbcType=VARCHAR},#{address,jdbcType=VARCHAR} - ,#{mainDiagnosis,jdbcType=VARCHAR},#{hospitalAgencyId,jdbcType=BIGINT},#{hospitalAgencyName,jdbcType=VARCHAR} - ,#{campusAgencyId,jdbcType=BIGINT},#{campusAgencyName,jdbcType=VARCHAR},#{departmentId,jdbcType=BIGINT} - ,#{departmentName,jdbcType=VARCHAR},#{wardId,jdbcType=BIGINT},#{wardName,jdbcType=VARCHAR} - ,#{appointmentTreatmentGroup,jdbcType=VARCHAR},#{registrationNo,jdbcType=VARCHAR},#{registrationDate,jdbcType=DATE} - ,#{appointmentDate,jdbcType=DATE},#{certificateIssuingDoctorId,jdbcType=BIGINT},#{certificateIssuingDoctorName,jdbcType=VARCHAR} - ,#{responsibleNurse,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR} - ,#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into patient_pre_hospitalization - - id, - patient_id, - patient_name, - patient_phone, - card_no, - sex, - birth_date, - family_member_phone, - address, - main_diagnosis, - hospital_agency_id, - hospital_agency_name, - campus_agency_id, - campus_agency_name, - department_id, - department_name, - ward_id, - ward_name, - appointment_treatment_group, - registration_no, - registration_date, - appointment_date, - certificate_issuing_doctor_id, - certificate_issuing_doctor_name, - responsible_nurse, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{id,jdbcType=BIGINT}, - #{patientId,jdbcType=BIGINT}, - #{patientName,jdbcType=VARCHAR}, - #{patientPhone,jdbcType=VARCHAR}, - #{cardNo,jdbcType=VARCHAR}, - #{sex,jdbcType=VARCHAR}, - #{birthDate,jdbcType=DATE}, - #{familyMemberPhone,jdbcType=VARCHAR}, - #{address,jdbcType=VARCHAR}, - #{mainDiagnosis,jdbcType=VARCHAR}, - #{hospitalAgencyId,jdbcType=BIGINT}, - #{hospitalAgencyName,jdbcType=VARCHAR}, - #{campusAgencyId,jdbcType=BIGINT}, - #{campusAgencyName,jdbcType=VARCHAR}, - #{departmentId,jdbcType=BIGINT}, - #{departmentName,jdbcType=VARCHAR}, - #{wardId,jdbcType=BIGINT}, - #{wardName,jdbcType=VARCHAR}, - #{appointmentTreatmentGroup,jdbcType=VARCHAR}, - #{registrationNo,jdbcType=VARCHAR}, - #{registrationDate,jdbcType=DATE}, - #{appointmentDate,jdbcType=DATE}, - #{certificateIssuingDoctorId,jdbcType=BIGINT}, - #{certificateIssuingDoctorName,jdbcType=VARCHAR}, - #{responsibleNurse,jdbcType=VARCHAR}, - #{delFlag,jdbcType=TINYINT}, - #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, - - - - update patient_pre_hospitalization - - - patient_id = #{patientId,jdbcType=BIGINT}, - - - patient_name = #{patientName,jdbcType=VARCHAR}, - - - patient_phone = #{patientPhone,jdbcType=VARCHAR}, - - - card_no = #{cardNo,jdbcType=VARCHAR}, - - - sex = #{sex,jdbcType=VARCHAR}, - - - birth_date = #{birthDate,jdbcType=DATE}, - - - family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, - - - hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, - - - hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, - - - campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, - - - campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, - - - department_id = #{departmentId,jdbcType=BIGINT}, - - - department_name = #{departmentName,jdbcType=VARCHAR}, - - - ward_id = #{wardId,jdbcType=BIGINT}, - - - ward_name = #{wardName,jdbcType=VARCHAR}, - - - appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, - - - registration_no = #{registrationNo,jdbcType=VARCHAR}, - - - registration_date = #{registrationDate,jdbcType=DATE}, - - - appointment_date = #{appointmentDate,jdbcType=DATE}, - - - certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, - - - certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, - - - responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, - - - del_flag = #{delFlag,jdbcType=TINYINT}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update patient_pre_hospitalization - set - patient_id = #{patientId,jdbcType=BIGINT}, - patient_name = #{patientName,jdbcType=VARCHAR}, - patient_phone = #{patientPhone,jdbcType=VARCHAR}, - card_no = #{cardNo,jdbcType=VARCHAR}, - sex = #{sex,jdbcType=VARCHAR}, - birth_date = #{birthDate,jdbcType=DATE}, - family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, - hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, - hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, - campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, - campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, - department_id = #{departmentId,jdbcType=BIGINT}, - department_name = #{departmentName,jdbcType=VARCHAR}, - ward_id = #{wardId,jdbcType=BIGINT}, - ward_name = #{wardName,jdbcType=VARCHAR}, - appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, - registration_no = #{registrationNo,jdbcType=VARCHAR}, - registration_date = #{registrationDate,jdbcType=DATE}, - appointment_date = #{appointmentDate,jdbcType=DATE}, - certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, - certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, - responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, - del_flag = #{delFlag,jdbcType=TINYINT}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - + + delete + from patient_pre_hospitalization + where id = #{id,jdbcType=BIGINT} + + + insert into patient_pre_hospitalization + ( id, resident_id, patient_id, patient_name + , patient_phone, card_no, sex + , birth_date, family_member_phone, address + , main_diagnosis, hospital_agency_id, hospital_agency_name + , campus_agency_id, campus_agency_name, department_id + , department_name, ward_id, ward_name + , appointment_treatment_group, registration_no, registration_date + , appointment_date, certificate_issuing_doctor_id, certificate_issuing_doctor_name + , responsible_nurse, del_flag, create_by + , create_time, update_by, update_time) + values ( #{id,jdbcType=BIGINT}, #{residentId,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{patientName,jdbcType=VARCHAR} + , #{patientPhone,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR} + , #{birthDate,jdbcType=DATE}, #{familyMemberPhone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR} + , #{mainDiagnosis,jdbcType=VARCHAR}, #{hospitalAgencyId,jdbcType=BIGINT}, #{hospitalAgencyName,jdbcType=VARCHAR} + , #{campusAgencyId,jdbcType=BIGINT}, #{campusAgencyName,jdbcType=VARCHAR}, #{departmentId,jdbcType=BIGINT} + , #{departmentName,jdbcType=VARCHAR}, #{wardId,jdbcType=BIGINT}, #{wardName,jdbcType=VARCHAR} + , #{appointmentTreatmentGroup,jdbcType=VARCHAR}, #{registrationNo,jdbcType=VARCHAR}, #{registrationDate,jdbcType=DATE} + , #{appointmentDate,jdbcType=DATE}, #{certificateIssuingDoctorId,jdbcType=BIGINT}, #{certificateIssuingDoctorName,jdbcType=VARCHAR} + , #{responsibleNurse,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR} + , #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}) + + + insert into patient_pre_hospitalization + + id, + resident_id, + patient_id, + patient_name, + patient_phone, + card_no, + sex, + birth_date, + family_member_phone, + address, + main_diagnosis, + hospital_agency_id, + hospital_agency_name, + campus_agency_id, + campus_agency_name, + department_id, + department_name, + ward_id, + ward_name, + appointment_treatment_group, + registration_no, + registration_date, + appointment_date, + certificate_issuing_doctor_id, + certificate_issuing_doctor_name, + responsible_nurse, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{residentId,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{patientPhone,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{sex,jdbcType=VARCHAR}, + #{birthDate,jdbcType=DATE}, + #{familyMemberPhone,jdbcType=VARCHAR}, + #{address,jdbcType=VARCHAR}, + #{mainDiagnosis,jdbcType=VARCHAR}, + #{hospitalAgencyId,jdbcType=BIGINT}, + #{hospitalAgencyName,jdbcType=VARCHAR}, + #{campusAgencyId,jdbcType=BIGINT}, + #{campusAgencyName,jdbcType=VARCHAR}, + #{departmentId,jdbcType=BIGINT}, + #{departmentName,jdbcType=VARCHAR}, + #{wardId,jdbcType=BIGINT}, + #{wardName,jdbcType=VARCHAR}, + #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + #{registrationNo,jdbcType=VARCHAR}, + #{registrationDate,jdbcType=DATE}, + #{appointmentDate,jdbcType=DATE}, + #{certificateIssuingDoctorId,jdbcType=BIGINT}, + #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + #{responsibleNurse,jdbcType=VARCHAR}, + #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update patient_pre_hospitalization + + + resident_id = #{residentId,jdbcType=BIGINT}, + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=VARCHAR}, + + + birth_date = #{birthDate,jdbcType=DATE}, + + + family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, + + + hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, + + + hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, + + + campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, + + + campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, + + + department_id = #{departmentId,jdbcType=BIGINT}, + + + department_name = #{departmentName,jdbcType=VARCHAR}, + + + ward_id = #{wardId,jdbcType=BIGINT}, + + + ward_name = #{wardName,jdbcType=VARCHAR}, + + + appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + + + registration_no = #{registrationNo,jdbcType=VARCHAR}, + + + registration_date = #{registrationDate,jdbcType=DATE}, + + + appointment_date = #{appointmentDate,jdbcType=DATE}, + + + certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, + + + certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + + + responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update patient_pre_hospitalization + set + resident_id = #{residentId,jdbcType=BIGINT}, + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + patient_phone = #{patientPhone,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=VARCHAR}, + birth_date = #{birthDate,jdbcType=DATE}, + family_member_phone = #{familyMemberPhone,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + main_diagnosis = #{mainDiagnosis,jdbcType=VARCHAR}, + hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, + hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, + campus_agency_id = #{campusAgencyId,jdbcType=BIGINT}, + campus_agency_name = #{campusAgencyName,jdbcType=VARCHAR}, + department_id = #{departmentId,jdbcType=BIGINT}, + department_name = #{departmentName,jdbcType=VARCHAR}, + ward_id = #{wardId,jdbcType=BIGINT}, + ward_name = #{wardName,jdbcType=VARCHAR}, + appointment_treatment_group = #{appointmentTreatmentGroup,jdbcType=VARCHAR}, + registration_no = #{registrationNo,jdbcType=VARCHAR}, + registration_date = #{registrationDate,jdbcType=DATE}, + appointment_date = #{appointmentDate,jdbcType=DATE}, + certificate_issuing_doctor_id = #{certificateIssuingDoctorId,jdbcType=BIGINT}, + certificate_issuing_doctor_name = #{certificateIssuingDoctorName,jdbcType=VARCHAR}, + responsible_nurse = #{responsibleNurse,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + del_flag = 0 + + and resident_id = #{residentId} + and patient_id = #{patientId} @@ -88,6 +100,8 @@ keyProperty="id"> insert into patient_visit_record + resident_id, + patient_id, card_no, @@ -162,6 +176,10 @@ surgical_name, + surgical_record, + + del_flag, + create_by, create_time, @@ -172,6 +190,8 @@ + #{residentId}, + #{patientId}, #{cardNo}, @@ -246,6 +266,10 @@ #{surgicalName}, + #{surgicalRecord}, + + #{delFlag}, + #{createBy}, #{createTime}, @@ -260,6 +284,9 @@ update patient_visit_record + resident_id = + #{residentId}, + patient_id = #{patientId}, @@ -371,6 +398,12 @@ surgical_name = #{surgicalName}, + surgical_record = + #{surgicalRecord}, + + del_flag = + #{delFlag}, + create_by = #{createBy}, @@ -386,18 +419,18 @@ where id = #{id} - - delete from patient_visit_record where id = #{id} - + + update patient_visit_record set del_flag = 1 where id = #{id} + - - delete from patient_visit_record where id in + + update patient_visit_record set del_flag = 1 where id in #{id} - + - insert into patient_visit_record(patient_id,card_no, + insert into patient_visit_record(resident_id,patient_id,card_no, patient_name,patient_phone,family_member_phone, address,sex,birth_date, age,nation,visit_method, @@ -409,12 +442,11 @@ admission_time,discharge_time,record_time, outpatient_visit_info,hospitalization_days,in_hospital_info, out_hospital_info,visit_serial_number,in_hospital_number, - responsible_nurse,surgical_name, - create_by,create_time,update_by, - update_time,remark) + responsible_nurse,surgical_name,surgical_record,del_flag, + create_by,create_time,update_by,update_time) values - (#{item.patientId,jdbcType=NUMERIC},#{item.cardNo,jdbcType=VARCHAR}, + (#{item.residentId,jdbcType=BIGINT},#{item.patientId,jdbcType=BIGINT},#{item.cardNo,jdbcType=VARCHAR}, #{item.patientName,jdbcType=VARCHAR},#{item.patientPhone,jdbcType=VARCHAR},#{item.familyMemberPhone,jdbcType=VARCHAR}, #{item.address,jdbcType=VARCHAR},#{item.sex,jdbcType=VARCHAR},#{item.birthDate,jdbcType=TIMESTAMP}, #{item.age,jdbcType=NUMERIC},#{item.nation,jdbcType=VARCHAR},#{item.visitMethod,jdbcType=VARCHAR}, @@ -426,16 +458,26 @@ #{item.admissionTime,jdbcType=TIMESTAMP},#{item.dischargeTime,jdbcType=TIMESTAMP},#{item.recordTime,jdbcType=TIMESTAMP}, #{item.outpatientVisitInfo,jdbcType=VARCHAR},#{item.hospitalizationDays,jdbcType=NUMERIC},#{item.inHospitalInfo,jdbcType=VARCHAR}, #{item.outHospitalInfo,jdbcType=VARCHAR},#{item.visitSerialNumber,jdbcType=VARCHAR},#{item.inHospitalNumber,jdbcType=VARCHAR}, - #{item.responsibleNurse,jdbcType=VARCHAR},#{item.surgicalName,jdbcType=VARCHAR}, + #{item.responsibleNurse,jdbcType=VARCHAR},#{item.surgicalName,jdbcType=VARCHAR},#{item.surgicalRecord,jdbcType=VARCHAR},#{item.delFlag,jdbcType=TINYINT}, #{item.createBy,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP},#{item.updateBy,jdbcType=VARCHAR}, - #{item.updateTime,jdbcType=TIMESTAMP},#{item.remark,jdbcType=VARCHAR}) + #{item.updateTime,jdbcType=TIMESTAMP}) - - where - hospital_agency_id = #{hospitalAgencyId,jdbcType=NUMERIC} - AND card_no != #{cardNo,jdbcType=VARCHAR} - AND in_hospital_number = #{inHospitalNumber,jdbcType=VARCHAR} + where del_flag = 0 + and hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT} + and in_hospital_number = #{inHospitalNumber,jdbcType=VARCHAR} + + and card_no != #{cardNo,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml index a84f2fc0..42d30bf0 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml @@ -4,37 +4,69 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select id, hospital_agency_id, hospital_agency_name, department_id, department_name, propaganda_title, propaganda_type, propaganda_code, propaganda_status, propaganda_content, propaganda_cover_path, article_summary, voicebroadcast, disease_type_id, disease_type_name, propaganda_link, propaganda_barcode_path, create_by, create_time, update_by, update_time from propaganda_info + select id, hospital_agency_id, hospital_agency_name, department_id, department_name, propaganda_title, propaganda_type, propaganda_code, propaganda_status, propaganda_content, propaganda_cover_path, article_summary, voicebroadcast, disease_type_id, disease_type_name, propaganda_link, propaganda_barcode_path,del_flag, create_by, create_time, update_by, update_time from propaganda_info - + select p.id, p.hospital_agency_id, p.hospital_agency_name, p.department_id, p.department_name, p.propaganda_title, + p.propaganda_type, p.propaganda_code, p.propaganda_status, p.propaganda_content, p.propaganda_cover_path, + p.article_summary, voicebroadcast, disease_type_id, disease_type_name, propaganda_link, + p.propaganda_barcode_path, pm.materials_id, + m.id, m.materials_name, m.materials_type, m.materials_option, m.materials_file_path, m.video_cover_type, + m.video_cover_file_path from propaganda_materials pm + left join propaganda_info p on pm.propaganda_id = p.id + left join materials_info m on m.id = pm.materials_id + where p.id = #{id} + + + insert into propaganda_info - hospital_agency_id, - - hospital_agency_name, - - department_id, - - department_name, - - propaganda_title, - - propaganda_type, - - propaganda_code, - - propaganda_status, - - propaganda_content, - - propaganda_cover_path, - - article_summary, - - voicebroadcast, - - disease_type_id, - - disease_type_name, - - propaganda_link, - - propaganda_barcode_path, - - create_by, - - create_time, - - update_by, - - update_time, - + hospital_agency_id, + + hospital_agency_name, + + department_id, + + department_name, + + propaganda_title, + + propaganda_type, + + propaganda_code, + + propaganda_status, + + propaganda_content, + + propaganda_cover_path, + + article_summary, + + voicebroadcast, + + disease_type_id, + + disease_type_name, + + propaganda_link, + + propaganda_barcode_path, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + - #{hospitalAgencyId}, - - #{hospitalAgencyName}, - - #{departmentId}, - - #{departmentName}, - - #{propagandaTitle}, - - #{propagandaType}, - - #{propagandaCode}, - - #{propagandaStatus}, - - #{propagandaContent}, - - #{propagandaCoverPath}, - - #{articleSummary}, - - #{voicebroadcast}, - - #{diseaseTypeId}, - - #{diseaseTypeName}, - - #{propagandaLink}, - - #{propagandaBarcodePath}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - + #{hospitalAgencyId}, + + #{hospitalAgencyName}, + + #{departmentId}, + + #{departmentName}, + + #{propagandaTitle}, + + #{propagandaType}, + + #{propagandaCode}, + + #{propagandaStatus}, + + #{propagandaContent}, + + #{propagandaCoverPath}, + + #{articleSummary}, + + #{voicebroadcast}, + + #{diseaseTypeId}, + + #{diseaseTypeName}, + + #{propagandaLink}, + + #{propagandaBarcodePath}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + - + update propaganda_info hospital_agency_id = @@ -211,6 +259,9 @@ propaganda_barcode_path = #{propagandaBarcodePath}, + del_flag = + #{delFlag}, + create_by = #{createBy}, @@ -227,22 +278,23 @@ where id = #{id} - - delete from propaganda_info where id = #{id} - + + update propaganda_info set del_flag = 1 where id = #{id} + - - delete from propaganda_info where id in + + update propaganda_info set del_flag = 1 where id in #{id} - + + @@ -44,86 +46,103 @@ where id = #{id} - insert into propaganda_materials - propaganda_id, - - propaganda_title, - - materials_id, - - materials_name, - - create_by, - - create_time, - - update_by, - - update_time, - + propaganda_id, + + propaganda_title, + + materials_id, + + materials_name, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + - #{propagandaId}, - - #{propagandaTitle}, - - #{materialsId}, - - #{materialsName}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - + #{propagandaId}, + + #{propagandaTitle}, + + #{materialsId}, + + #{materialsName}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + - + update propaganda_materials - propaganda_id = - #{propagandaId}, - - propaganda_title = - #{propagandaTitle}, - - materials_id = - #{materialsId}, - - materials_name = - #{materialsName}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - + propaganda_id = + #{propagandaId}, + + propaganda_title = + #{propagandaTitle}, + + materials_id = + #{materialsId}, + + materials_name = + #{materialsName}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + where id = #{id} - - delete from propaganda_materials where id = #{id} - + + update propaganda_materials set del_flag = 1 where propaganda_id = #{propagandaId} + - - delete from propaganda_materials where id in + + update propaganda_materials set del_flag = 1 where propaganda_id in + + #{propagandaId} + + + + + update propaganda_materials set del_flag = 1 where id = #{id} + + + update propaganda_materials set del_flag = 1 where id in #{id} - + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/residentinfo/ResidentInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/residentinfo/ResidentInfoMapper.xml new file mode 100644 index 00000000..1c5ae83d --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/residentinfo/ResidentInfoMapper.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, patient_name, patient_phone, family_member_phone, birth_date, card_no, sex, address, open_id, union_id, official_account_openid, create_by, create_time, update_by, update_time from resident_info + + + + + + + + insert into resident_info + + patient_name, + + patient_phone, + + family_member_phone, + + birth_date, + + card_no, + + sex, + + address, + + open_id, + + union_id, + + official_account_openid, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{patientName}, + + #{patientPhone}, + + #{familyMemberPhone}, + + #{birthDate}, + + #{cardNo}, + + #{sex}, + + #{address}, + + #{openId}, + + #{unionId}, + + #{officialAccountOpenid}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update resident_info + + patient_name = + #{patientName}, + + patient_phone = + #{patientPhone}, + + family_member_phone = + #{familyMemberPhone}, + + birth_date = + #{birthDate}, + + card_no = + #{cardNo}, + + sex = + #{sex}, + + address = + #{address}, + + open_id = + #{openId}, + + union_id = + #{unionId}, + + official_account_openid = + #{officialAccountOpenid}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from resident_info where id = #{id} + + + + delete from resident_info where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml index 6f516417..58f73019 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml @@ -170,4 +170,19 @@ #{id} + + insert into sign_route_trigger_condition(id,patient_manage_route_id,route_name, + trigger_condition_code,trigger_condition_name,trigger_condition_operator, + trigger_condition_value,trigger_condition_sort,trigger_condition_remark, + search_value,create_by,create_time, + update_by,update_time) + values + + (#{item.id,jdbcType=NUMERIC},#{item.patientManageRouteId,jdbcType=NUMERIC},#{item.routeName,jdbcType=VARCHAR}, + #{item.triggerConditionCode,jdbcType=VARCHAR},#{item.triggerConditionName,jdbcType=VARCHAR},#{item.triggerConditionOperator,jdbcType=VARCHAR}, + #{item.triggerConditionValue,jdbcType=VARCHAR},#{item.triggerConditionSort,jdbcType=NUMERIC},#{item.triggerConditionRemark,jdbcType=VARCHAR}, + #{item.searchValue,jdbcType=VARCHAR},#{item.createBy,jdbcType=VARCHAR},#{item.createTime}, + #{item.updateBy,jdbcType=VARCHAR},#{item.updateTime}) + + \ No newline at end of file From 37d51adeaa6eec8e044440b8dba4dafecf26c205 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 28 Mar 2024 17:48:09 +0800 Subject: [PATCH 26/32] =?UTF-8?q?=E6=82=A3=E8=80=85=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PatientQuestionOptionResultController.java | 91 ++++ ...atientQuestionSubjectResultController.java | 92 ++++ ...PatientQuestionSubmitResultController.java | 91 ++++ .../PatientQuestionOptionResult.java | 126 ++++++ .../PatientQuestionSubjectResult.java | 147 +++++++ .../PatientQuestionSubmitResult.java | 200 +++++++++ .../SignPatientManageRouteNode.java | 4 + .../PatientQuestionOptionResultMapper.java | 61 +++ .../PatientQuestionSubjectResultMapper.java | 61 +++ .../PatientQuestionSubmitResultMapper.java | 64 +++ .../agency/impl/AgencyServiceImpl.java | 24 +- .../IPatientQuestionOptionResultService.java | 61 +++ ...atientQuestionOptionResultServiceImpl.java | 90 ++++ .../IPatientQuestionSubjectResultService.java | 61 +++ ...tientQuestionSubjectResultServiceImpl.java | 90 ++++ .../IPatientQuestionSubmitResultService.java | 61 +++ ...atientQuestionSubmitResultServiceImpl.java | 93 ++++ .../PatientQuestionSubjectResultDTO.java | 23 + .../PatientQuestionSubmitResultDTO.java | 33 ++ .../PatientQuestionOptionResultMapper.xml | 213 +++++++++ .../PatientQuestionSubjectResultMapper.xml | 273 ++++++++++++ .../PatientQuestionSubmitResultMapper.xml | 413 ++++++++++++++++++ .../SignPatientManageRouteNodeMapper.xml | 17 +- .../mapper/manage/sysarea/SysAreaMapper.xml | 19 + 24 files changed, 2394 insertions(+), 14 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionoptionresult/PatientQuestionOptionResultController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubjectresult/PatientQuestionSubjectResultController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionoptionresult/PatientQuestionOptionResultMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/IPatientQuestionOptionResultService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/impl/PatientQuestionOptionResultServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/IPatientQuestionSubjectResultService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/impl/PatientQuestionSubjectResultServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionoptionresult/PatientQuestionOptionResultController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionoptionresult/PatientQuestionOptionResultController.java new file mode 100644 index 00000000..5678af2a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionoptionresult/PatientQuestionOptionResultController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.patientquestionoptionresult; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult; +import com.xinelu.manage.service.patientquestionoptionresult.IPatientQuestionOptionResultService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 患者问卷题目选项提交结果信息Controller + * + * @author xinelu + * @date 2024-03-28 + */ +@RestController +@RequestMapping("/system/patientQuestionOptionResult") +public class PatientQuestionOptionResultController extends BaseController { + @Resource + private IPatientQuestionOptionResultService patientQuestionOptionResultService; + + /** + * 查询患者问卷题目选项提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:list')") + @GetMapping("/list") + public TableDataInfo list(PatientQuestionOptionResult patientQuestionOptionResult) { + startPage(); + List list = patientQuestionOptionResultService.selectPatientQuestionOptionResultList(patientQuestionOptionResult); + return getDataTable(list); + } + + /** + * 导出患者问卷题目选项提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:export')") + @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PatientQuestionOptionResult patientQuestionOptionResult) { + List list = patientQuestionOptionResultService.selectPatientQuestionOptionResultList(patientQuestionOptionResult); + ExcelUtil util = new ExcelUtil<>(PatientQuestionOptionResult.class); + util.exportExcel(response, list, "患者问卷题目选项提交结果信息数据"); + } + + /** + * 获取患者问卷题目选项提交结果信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientQuestionOptionResultService.selectPatientQuestionOptionResultById(id)); + } + + /** + * 新增患者问卷题目选项提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:add')") + @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PatientQuestionOptionResult patientQuestionOptionResult) { + return toAjax(patientQuestionOptionResultService.insertPatientQuestionOptionResult(patientQuestionOptionResult)); + } + + /** + * 修改患者问卷题目选项提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:edit')") + @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PatientQuestionOptionResult patientQuestionOptionResult) { + return toAjax(patientQuestionOptionResultService.updatePatientQuestionOptionResult(patientQuestionOptionResult)); + } + + /** + * 删除患者问卷题目选项提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:remove')") + @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientQuestionOptionResultService.deletePatientQuestionOptionResultByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubjectresult/PatientQuestionSubjectResultController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubjectresult/PatientQuestionSubjectResultController.java new file mode 100644 index 00000000..14992127 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubjectresult/PatientQuestionSubjectResultController.java @@ -0,0 +1,92 @@ +package com.xinelu.manage.controller.patientquestionsubjectresult; + + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult; +import com.xinelu.manage.service.patientquestionsubjectresult.IPatientQuestionSubjectResultService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 患者问卷题目提交结果信息Controller + * + * @author xinelu + * @date 2024-03-28 + */ +@RestController +@RequestMapping("/system/patientQuestionSubjectResult") +public class PatientQuestionSubjectResultController extends BaseController { + @Resource + private IPatientQuestionSubjectResultService patientQuestionSubjectResultService; + + /** + * 查询患者问卷题目提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:list')") + @GetMapping("/list") + public TableDataInfo list(PatientQuestionSubjectResult patientQuestionSubjectResult) { + startPage(); + List list = patientQuestionSubjectResultService.selectPatientQuestionSubjectResultList(patientQuestionSubjectResult); + return getDataTable(list); + } + + /** + * 导出患者问卷题目提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:export')") + @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PatientQuestionSubjectResult patientQuestionSubjectResult) { + List list = patientQuestionSubjectResultService.selectPatientQuestionSubjectResultList(patientQuestionSubjectResult); + ExcelUtil util = new ExcelUtil<>(PatientQuestionSubjectResult.class); + util.exportExcel(response, list, "患者问卷题目提交结果信息数据"); + } + + /** + * 获取患者问卷题目提交结果信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientQuestionSubjectResultService.selectPatientQuestionSubjectResultById(id)); + } + + /** + * 新增患者问卷题目提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:add')") + @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PatientQuestionSubjectResult patientQuestionSubjectResult) { + return toAjax(patientQuestionSubjectResultService.insertPatientQuestionSubjectResult(patientQuestionSubjectResult)); + } + + /** + * 修改患者问卷题目提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:edit')") + @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PatientQuestionSubjectResult patientQuestionSubjectResult) { + return toAjax(patientQuestionSubjectResultService.updatePatientQuestionSubjectResult(patientQuestionSubjectResult)); + } + + /** + * 删除患者问卷题目提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:remove')") + @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientQuestionSubjectResultService.deletePatientQuestionSubjectResultByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java new file mode 100644 index 00000000..568e9899 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java @@ -0,0 +1,91 @@ +package com.xinelu.manage.controller.patientquestionsubmitresult; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 患者问卷提交结果信息Controller + * + * @author xinelu + * @date 2024-03-28 + */ +@RestController +@RequestMapping("/system/patientQuestionSubmitResult") +public class PatientQuestionSubmitResultController extends BaseController { + @Resource + private IPatientQuestionSubmitResultService patientQuestionSubmitResultService; + + /** + * 查询患者问卷提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:list')") + @GetMapping("/list") + public TableDataInfo list(PatientQuestionSubmitResult patientQuestionSubmitResult) { + startPage(); + List list = patientQuestionSubmitResultService.selectPatientQuestionSubmitResultList(patientQuestionSubmitResult); + return getDataTable(list); + } + + /** + * 导出患者问卷提交结果信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:export')") + @Log(title = "患者问卷提交结果信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PatientQuestionSubmitResult patientQuestionSubmitResult) { + List list = patientQuestionSubmitResultService.selectPatientQuestionSubmitResultList(patientQuestionSubmitResult); + ExcelUtil util = new ExcelUtil<>(PatientQuestionSubmitResult.class); + util.exportExcel(response, list, "患者问卷提交结果信息数据"); + } + + /** + * 获取患者问卷提交结果信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientQuestionSubmitResultService.selectPatientQuestionSubmitResultById(id)); + } + + /** + * 新增患者问卷提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:add')") + @Log(title = "患者问卷提交结果信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody PatientQuestionSubmitResult patientQuestionSubmitResult) { + return toAjax(patientQuestionSubmitResultService.insertPatientQuestionSubmitResult(patientQuestionSubmitResult)); + } + + /** + * 修改患者问卷提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:edit')") + @Log(title = "患者问卷提交结果信息", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult edit(@RequestBody PatientQuestionSubmitResult patientQuestionSubmitResult) { + return toAjax(patientQuestionSubmitResultService.updatePatientQuestionSubmitResult(patientQuestionSubmitResult)); + } + + /** + * 删除患者问卷提交结果信息 + */ + @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:remove')") + @Log(title = "患者问卷提交结果信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientQuestionSubmitResultService.deletePatientQuestionSubmitResultByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java new file mode 100644 index 00000000..d56413ea --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java @@ -0,0 +1,126 @@ +package com.xinelu.manage.domain.patientquestionoptionresult; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 患者问卷题目选项提交结果信息对象 patient_question_option_result + * + * @author xinelu + * @date 2024-03-28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者问卷题目选项提交结果信息对象", description = "patient_question_option_result") +public class PatientQuestionOptionResult extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 问卷题目提交结果信息表id + */ + @ApiModelProperty(value = "问卷题目提交结果信息表id") + @Excel(name = "问卷题目提交结果信息表id") + private Long questionSubjectResultId; + + /** + * 问卷题目表id + */ + @ApiModelProperty(value = "问卷题目表id") + @Excel(name = "问卷题目表id") + private Long questionnaireSubjectId; + + /** + * 题目名称 + */ + @ApiModelProperty(value = "题目名称") + @Excel(name = "题目名称") + private String questionName; + + /** + * 选项名称 + */ + @ApiModelProperty(value = "选项名称") + @Excel(name = "选项名称") + private String optionName; + + /** + * 选项答案 + */ + @ApiModelProperty(value = "选项答案") + @Excel(name = "选项答案") + private String optionAnswer; + + /** + * 选项分值 + */ + @ApiModelProperty(value = "选项分值") + @Excel(name = "选项分值") + private BigDecimal optionScore; + + /** + * 题目选项选择标识，0：已选择，1：未选择 + */ + @ApiModelProperty(value = "题目选项选择标识，0：已选择，1：未选择") + @Excel(name = "题目选项选择标识，0：已选择，1：未选择") + private Integer optionChooseSign; + + /** + * 选项题目提交答案 + */ + @ApiModelProperty(value = "选项题目提交答案") + @Excel(name = "选项题目提交答案") + private String optionSubmitAnswer; + + /** + * 选项排序 + */ + @ApiModelProperty(value = "选项排序") + @Excel(name = "选项排序") + private Integer optionSort; + + /** + * 选项备注 + */ + @ApiModelProperty(value = "选项备注") + @Excel(name = "选项备注") + private String optionRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("questionSubjectResultId", getQuestionSubjectResultId()) + .append("questionnaireSubjectId", getQuestionnaireSubjectId()) + .append("questionName", getQuestionName()) + .append("optionName", getOptionName()) + .append("optionAnswer", getOptionAnswer()) + .append("optionScore", getOptionScore()) + .append("optionChooseSign", getOptionChooseSign()) + .append("optionSubmitAnswer", getOptionSubmitAnswer()) + .append("optionSort", getOptionSort()) + .append("optionRemark", getOptionRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java new file mode 100644 index 00000000..4f498b01 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java @@ -0,0 +1,147 @@ +package com.xinelu.manage.domain.patientquestionsubjectresult; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 患者问卷题目提交结果信息对象 patient_question_subject_result + * + * @author xinelu + * @date 2024-03-28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者问卷题目提交结果信息对象", description = "patient_question_subject_result") +public class PatientQuestionSubjectResult extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 问卷提交结果信息表id + */ + @ApiModelProperty(value = "问卷提交结果信息表id") + @Excel(name = "问卷提交结果信息表id") + private Long questionSubmitResultId; + + /** + * 问卷表id + */ + @ApiModelProperty(value = "问卷表id") + @Excel(name = "问卷表id") + private Long questionInfoId; + + /** + * 题目序号 + */ + @ApiModelProperty(value = "题目序号") + @Excel(name = "题目序号") + private BigDecimal questionNumber; + + /** + * 题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， + * 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， + * 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT + */ + @ApiModelProperty(value = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT") + @Excel(name = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT") + private String questionType; + + /** + * 题目名称 + */ + @ApiModelProperty(value = "题目名称") + @Excel(name = "题目名称") + private String questionName; + + /** + * 题目说明 + */ + @ApiModelProperty(value = "题目说明") + @Excel(name = "题目说明") + private String questionDescription; + + /** + * 填写说明 + */ + @ApiModelProperty(value = "填写说明") + @Excel(name = "填写说明") + private String writeDescription; + + /** + * 回答（填空题） + */ + @ApiModelProperty(value = "回答") + @Excel(name = "回答", readConverterExp = "填=空题") + private String fillBlanksAnswer; + + /** + * 选项个数（打分题） + */ + @ApiModelProperty(value = "选项个数") + @Excel(name = "选项个数", readConverterExp = "打=分题") + private Integer optionCount; + + /** + * 是否计分，0：否，1：是 + */ + @ApiModelProperty(value = "是否计分，0：否，1：是") + @Excel(name = "是否计分，0：否，1：是") + private Integer whetherScore; + + /** + * 计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER + */ + @ApiModelProperty(value = "计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER") + @Excel(name = "计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER") + private String scoringMethod; + + /** + * 计分说明 + */ + @ApiModelProperty(value = "计分说明") + @Excel(name = "计分说明") + private String scoringDescription; + + /** + * 题目分值 + */ + @ApiModelProperty(value = "题目分值") + @Excel(name = "题目分值") + private BigDecimal questionScore; + + /** + * 题目排序 + */ + @ApiModelProperty(value = "题目排序") + @Excel(name = "题目排序") + private Integer questionSort; + + /** + * 题目备注 + */ + @ApiModelProperty(value = "题目备注") + @Excel(name = "题目备注") + private String questionRemark; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("questionSubmitResultId", getQuestionSubmitResultId()).append("questionInfoId", getQuestionInfoId()).append("questionNumber", getQuestionNumber()).append("questionType", getQuestionType()).append("questionName", getQuestionName()).append("questionDescription", getQuestionDescription()).append("writeDescription", getWriteDescription()).append("fillBlanksAnswer", getFillBlanksAnswer()).append("optionCount", getOptionCount()).append("whetherScore", getWhetherScore()).append("scoringMethod", getScoringMethod()).append("scoringDescription", getScoringDescription()).append("questionScore", getQuestionScore()).append("questionSort", getQuestionSort()).append("questionRemark", getQuestionRemark()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java new file mode 100644 index 00000000..cff3107e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java @@ -0,0 +1,200 @@ +package com.xinelu.manage.domain.patientquestionsubmitresult; + + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 患者问卷提交结果信息对象 patient_question_submit_result + * + * @author xinelu + * @date 2024-03-28 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者问卷提交结果信息对象", description = "patient_question_submit_result") +public class PatientQuestionSubmitResult extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long id; + + /** + * 管理任务执行记录表id + */ + @ApiModelProperty(value = "管理任务执行记录表id") + @Excel(name = "管理任务执行记录表id") + private Long taskExecuteRecordId; + + /** + * 患者表id + */ + @ApiModelProperty(value = "患者表id") + @Excel(name = "患者表id") + private Long patientId; + + /** + * 签约患者管理任务表id + */ + @ApiModelProperty(value = "签约患者管理任务表id") + @Excel(name = "签约患者管理任务表id") + private Long manageRouteId; + + /** + * 签约患者管理任务节点表id + */ + @ApiModelProperty(value = "签约患者管理任务节点表id") + @Excel(name = "签约患者管理任务节点表id") + private Long manageRouteNodeId; + + /** + * 患者姓名（提交者姓名） + */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名", readConverterExp = "提=交者姓名") + private String patientName; + + /** + * 签约患者管理任务名称 + */ + @ApiModelProperty(value = "签约患者管理任务名称") + @Excel(name = "签约患者管理任务名称") + private String manageRouteName; + + /** + * 签约患者管理路径节点名称 + */ + @ApiModelProperty(value = "签约患者管理路径节点名称") + @Excel(name = "签约患者管理路径节点名称") + private String manageRouteNodeName; + + /** + * 问卷表id + */ + @ApiModelProperty(value = "问卷表id") + @Excel(name = "问卷表id") + private Long questionInfoId; + + /** + * 所属科室id + */ + @ApiModelProperty(value = "所属科室id") + @Excel(name = "所属科室id") + private Long departmentId; + + /** + * 所属科室名称 + */ + @ApiModelProperty(value = "所属科室名称") + @Excel(name = "所属科室名称") + private String departmentName; + + /** + * 病种id + */ + @ApiModelProperty(value = "病种id") + @Excel(name = "病种id") + private Long diseaseTypeId; + + /** + * 病种名称 + */ + @ApiModelProperty(value = "病种名称") + @Excel(name = "病种名称") + private String diseaseTypeName; + + /** + * 问卷标题 + */ + @ApiModelProperty(value = "问卷标题") + @Excel(name = "问卷标题") + private String questionnaireName; + + /** + * 问卷说明 + */ + @ApiModelProperty(value = "问卷说明") + @Excel(name = "问卷说明") + private String questionnaireDescription; + + /** + * 作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION + */ + @ApiModelProperty(value = "作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION") + @Excel(name = "作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION") + private String answeringMethod; + + /** + * 问卷ID + */ + @ApiModelProperty(value = "问卷ID") + @Excel(name = "问卷ID") + private String questionnaireId; + + /** + * 问题个数 + */ + @ApiModelProperty(value = "问题个数") + @Excel(name = "问题个数") + private Integer questionCount; + + /** + * 问卷总分值，小数点后两位 + */ + @ApiModelProperty(value = "问卷总分值，小数点后两位") + @Excel(name = "问卷总分值，小数点后两位") + private BigDecimal questionnaireTotalScore; + + /** + * 问卷总得分，根据患者提交问卷得出的分值 + */ + @ApiModelProperty(value = "问卷总得分，根据患者提交问卷得出的分值") + @Excel(name = "问卷总得分，根据患者提交问卷得出的分值") + private BigDecimal totalScore; + + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("taskExecuteRecordId", getTaskExecuteRecordId()) + .append("patientId", getPatientId()) + .append("manageRouteId", getManageRouteId()) + .append("manageRouteNodeId", getManageRouteNodeId()) + .append("patientName", getPatientName()) + .append("manageRouteName", getManageRouteName()) + .append("manageRouteNodeName", getManageRouteNodeName()) + .append("questionInfoId", getQuestionInfoId()) + .append("departmentId", getDepartmentId()) + .append("departmentName", getDepartmentName()) + .append("diseaseTypeId", getDiseaseTypeId()) + .append("diseaseTypeName", getDiseaseTypeName()) + .append("questionnaireName", getQuestionnaireName()) + .append("questionnaireDescription", getQuestionnaireDescription()) + .append("answeringMethod", getAnsweringMethod()) + .append("questionnaireId", getQuestionnaireId()) + .append("questionCount", getQuestionCount()) + .append("questionnaireTotalScore", getQuestionnaireTotalScore()) + .append("totalScore", getTotalScore()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index ab016ca7..f3c28637 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -306,4 +306,8 @@ public class SignPatientManageRouteNode extends BaseEntity { @Excel(name = "任务链接") private String routeLink; + /** 文字提醒内容 */ + @ApiModelProperty(value = "文字提醒内容") + @Excel(name = "文字提醒内容") + private String textRemindContent; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionoptionresult/PatientQuestionOptionResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionoptionresult/PatientQuestionOptionResultMapper.java new file mode 100644 index 00000000..ed712d3a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionoptionresult/PatientQuestionOptionResultMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.patientquestionoptionresult; + +import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult; + +import java.util.List; + +/** + * 患者问卷题目选项提交结果信息Mapper接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface PatientQuestionOptionResultMapper { + /** + * 查询患者问卷题目选项提交结果信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 患者问卷题目选项提交结果信息 + */ + PatientQuestionOptionResult selectPatientQuestionOptionResultById(Long id); + + /** + * 查询患者问卷题目选项提交结果信息列表 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 患者问卷题目选项提交结果信息集合 + */ + List selectPatientQuestionOptionResultList(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 新增患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + int insertPatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 修改患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + int updatePatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 删除患者问卷题目选项提交结果信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionOptionResultById(Long id); + + /** + * 批量删除患者问卷题目选项提交结果信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deletePatientQuestionOptionResultByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.java new file mode 100644 index 00000000..ad7264a4 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.patientquestionsubjectresult; + +import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult; + +import java.util.List; + +/** + * 患者问卷题目提交结果信息Mapper接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface PatientQuestionSubjectResultMapper { + /** + * 查询患者问卷题目提交结果信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 患者问卷题目提交结果信息 + */ + PatientQuestionSubjectResult selectPatientQuestionSubjectResultById(Long id); + + /** + * 查询患者问卷题目提交结果信息列表 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 患者问卷题目提交结果信息集合 + */ + List selectPatientQuestionSubjectResultList(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 新增患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + int insertPatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 修改患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + int updatePatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 删除患者问卷题目提交结果信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionSubjectResultById(Long id); + + /** + * 批量删除患者问卷题目提交结果信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deletePatientQuestionSubjectResultByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java new file mode 100644 index 00000000..11144866 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java @@ -0,0 +1,64 @@ +package com.xinelu.manage.mapper.patientquestionsubmitresult; + +import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitResultDTO; + +import java.util.List; + +/** + * 患者问卷提交结果信息Mapper接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface PatientQuestionSubmitResultMapper { + /** + * 查询患者问卷提交结果信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 患者问卷提交结果信息 + */ + PatientQuestionSubmitResult selectPatientQuestionSubmitResultById(Long id); + + /** + * 查询患者问卷提交结果信息列表 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 患者问卷提交结果信息集合 + */ + List selectPatientQuestionSubmitResultList(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 新增患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 修改患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 删除患者问卷提交结果信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionSubmitResultById(Long id); + + /** + * 批量删除患者问卷提交结果信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deletePatientQuestionSubmitResultByIds(Long[] ids); + + PatientQuestionSubmitResultDTO selectResultByTaskExecuteRecordId(Long taskExecuteRecordId); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index 8a8f85a0..6b58c9d5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -59,18 +59,20 @@ public class AgencyServiceImpl implements IAgencyService { @Override public AgencyVO selectAgencyById(Long id) { AgencyVO agency = agencyMapper.selectAgencyVOById(id); - if (StringUtils.isNotBlank(agency.getAreaCode())) { + if (Objects.nonNull(agency) && StringUtils.isNotBlank(agency.getAreaCode())) { SysAreaVO nurseStationAndAreaCode = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(agency.getAreaCode()); - agency.setProvinceCode(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceCode()) ? "" : nurseStationAndAreaCode.getProvinceCode()); - agency.setProvinceName(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceName()) ? "" : nurseStationAndAreaCode.getProvinceName()); - agency.setCityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCityCode()) ? "" : nurseStationAndAreaCode.getCityCode()); - agency.setCityName(StringUtils.isBlank(nurseStationAndAreaCode.getCityName()) ? "" : nurseStationAndAreaCode.getCityName()); - agency.setRegionCode(StringUtils.isBlank(nurseStationAndAreaCode.getRegionCode()) ? "" : nurseStationAndAreaCode.getRegionCode()); - agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName()); - agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode()); - agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName()); - agency.setCommunityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityCode()) ? "" : nurseStationAndAreaCode.getCommunityCode()); - agency.setCommunityName(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityName()) ? "" : nurseStationAndAreaCode.getCommunityName()); + if (Objects.nonNull(nurseStationAndAreaCode)) { + agency.setProvinceCode(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceCode()) ? "" : nurseStationAndAreaCode.getProvinceCode()); + agency.setProvinceName(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceName()) ? "" : nurseStationAndAreaCode.getProvinceName()); + agency.setCityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCityCode()) ? "" : nurseStationAndAreaCode.getCityCode()); + agency.setCityName(StringUtils.isBlank(nurseStationAndAreaCode.getCityName()) ? "" : nurseStationAndAreaCode.getCityName()); + agency.setRegionCode(StringUtils.isBlank(nurseStationAndAreaCode.getRegionCode()) ? "" : nurseStationAndAreaCode.getRegionCode()); + agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName()); + agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode()); + agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName()); + agency.setCommunityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityCode()) ? "" : nurseStationAndAreaCode.getCommunityCode()); + agency.setCommunityName(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityName()) ? "" : nurseStationAndAreaCode.getCommunityName()); + } } return agency; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/IPatientQuestionOptionResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/IPatientQuestionOptionResultService.java new file mode 100644 index 00000000..1259b732 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/IPatientQuestionOptionResultService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.patientquestionoptionresult; + +import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult; + +import java.util.List; + +/** + * 患者问卷题目选项提交结果信息Service接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface IPatientQuestionOptionResultService { + /** + * 查询患者问卷题目选项提交结果信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 患者问卷题目选项提交结果信息 + */ + PatientQuestionOptionResult selectPatientQuestionOptionResultById(Long id); + + /** + * 查询患者问卷题目选项提交结果信息列表 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 患者问卷题目选项提交结果信息集合 + */ + List selectPatientQuestionOptionResultList(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 新增患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + int insertPatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 修改患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + int updatePatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult); + + /** + * 批量删除患者问卷题目选项提交结果信息 + * + * @param ids 需要删除的患者问卷题目选项提交结果信息主键集合 + * @return 结果 + */ + int deletePatientQuestionOptionResultByIds(Long[] ids); + + /** + * 删除患者问卷题目选项提交结果信息信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionOptionResultById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/impl/PatientQuestionOptionResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/impl/PatientQuestionOptionResultServiceImpl.java new file mode 100644 index 00000000..5640e6a7 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionoptionresult/impl/PatientQuestionOptionResultServiceImpl.java @@ -0,0 +1,90 @@ +package com.xinelu.manage.service.patientquestionoptionresult.impl; + +import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult; +import com.xinelu.manage.mapper.patientquestionoptionresult.PatientQuestionOptionResultMapper; +import com.xinelu.manage.service.patientquestionoptionresult.IPatientQuestionOptionResultService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 患者问卷题目选项提交结果信息Service业务层处理 + * + * @author xinelu + * @date 2024-03-28 + */ +@Service +public class PatientQuestionOptionResultServiceImpl implements IPatientQuestionOptionResultService { + @Resource + private PatientQuestionOptionResultMapper patientQuestionOptionResultMapper; + + /** + * 查询患者问卷题目选项提交结果信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 患者问卷题目选项提交结果信息 + */ + @Override + public PatientQuestionOptionResult selectPatientQuestionOptionResultById(Long id) { + return patientQuestionOptionResultMapper.selectPatientQuestionOptionResultById(id); + } + + /** + * 查询患者问卷题目选项提交结果信息列表 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 患者问卷题目选项提交结果信息 + */ + @Override + public List selectPatientQuestionOptionResultList(PatientQuestionOptionResult patientQuestionOptionResult) { + return patientQuestionOptionResultMapper.selectPatientQuestionOptionResultList(patientQuestionOptionResult); + } + + /** + * 新增患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + @Override + public int insertPatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult) { + patientQuestionOptionResult.setCreateTime(LocalDateTime.now()); + return patientQuestionOptionResultMapper.insertPatientQuestionOptionResult(patientQuestionOptionResult); + } + + /** + * 修改患者问卷题目选项提交结果信息 + * + * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息 + * @return 结果 + */ + @Override + public int updatePatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult) { + patientQuestionOptionResult.setUpdateTime(LocalDateTime.now()); + return patientQuestionOptionResultMapper.updatePatientQuestionOptionResult(patientQuestionOptionResult); + } + + /** + * 批量删除患者问卷题目选项提交结果信息 + * + * @param ids 需要删除的患者问卷题目选项提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionOptionResultByIds(Long[] ids) { + return patientQuestionOptionResultMapper.deletePatientQuestionOptionResultByIds(ids); + } + + /** + * 删除患者问卷题目选项提交结果信息信息 + * + * @param id 患者问卷题目选项提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionOptionResultById(Long id) { + return patientQuestionOptionResultMapper.deletePatientQuestionOptionResultById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/IPatientQuestionSubjectResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/IPatientQuestionSubjectResultService.java new file mode 100644 index 00000000..8153bd9f --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/IPatientQuestionSubjectResultService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.patientquestionsubjectresult; + +import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult; + +import java.util.List; + +/** + * 患者问卷题目提交结果信息Service接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface IPatientQuestionSubjectResultService { + /** + * 查询患者问卷题目提交结果信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 患者问卷题目提交结果信息 + */ + public PatientQuestionSubjectResult selectPatientQuestionSubjectResultById(Long id); + + /** + * 查询患者问卷题目提交结果信息列表 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 患者问卷题目提交结果信息集合 + */ + List selectPatientQuestionSubjectResultList(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 新增患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + int insertPatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 修改患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + int updatePatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult); + + /** + * 批量删除患者问卷题目提交结果信息 + * + * @param ids 需要删除的患者问卷题目提交结果信息主键集合 + * @return 结果 + */ + int deletePatientQuestionSubjectResultByIds(Long[] ids); + + /** + * 删除患者问卷题目提交结果信息信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionSubjectResultById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/impl/PatientQuestionSubjectResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/impl/PatientQuestionSubjectResultServiceImpl.java new file mode 100644 index 00000000..821d7e97 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubjectresult/impl/PatientQuestionSubjectResultServiceImpl.java @@ -0,0 +1,90 @@ +package com.xinelu.manage.service.patientquestionsubjectresult.impl; + +import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult; +import com.xinelu.manage.mapper.patientquestionsubjectresult.PatientQuestionSubjectResultMapper; +import com.xinelu.manage.service.patientquestionsubjectresult.IPatientQuestionSubjectResultService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 患者问卷题目提交结果信息Service业务层处理 + * + * @author xinelu + * @date 2024-03-28 + */ +@Service +public class PatientQuestionSubjectResultServiceImpl implements IPatientQuestionSubjectResultService { + @Resource + private PatientQuestionSubjectResultMapper patientQuestionSubjectResultMapper; + + /** + * 查询患者问卷题目提交结果信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 患者问卷题目提交结果信息 + */ + @Override + public PatientQuestionSubjectResult selectPatientQuestionSubjectResultById(Long id) { + return patientQuestionSubjectResultMapper.selectPatientQuestionSubjectResultById(id); + } + + /** + * 查询患者问卷题目提交结果信息列表 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 患者问卷题目提交结果信息 + */ + @Override + public List selectPatientQuestionSubjectResultList(PatientQuestionSubjectResult patientQuestionSubjectResult) { + return patientQuestionSubjectResultMapper.selectPatientQuestionSubjectResultList(patientQuestionSubjectResult); + } + + /** + * 新增患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + @Override + public int insertPatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult) { + patientQuestionSubjectResult.setCreateTime(LocalDateTime.now()); + return patientQuestionSubjectResultMapper.insertPatientQuestionSubjectResult(patientQuestionSubjectResult); + } + + /** + * 修改患者问卷题目提交结果信息 + * + * @param patientQuestionSubjectResult 患者问卷题目提交结果信息 + * @return 结果 + */ + @Override + public int updatePatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult) { + patientQuestionSubjectResult.setUpdateTime(LocalDateTime.now()); + return patientQuestionSubjectResultMapper.updatePatientQuestionSubjectResult(patientQuestionSubjectResult); + } + + /** + * 批量删除患者问卷题目提交结果信息 + * + * @param ids 需要删除的患者问卷题目提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionSubjectResultByIds(Long[] ids) { + return patientQuestionSubjectResultMapper.deletePatientQuestionSubjectResultByIds(ids); + } + + /** + * 删除患者问卷题目提交结果信息信息 + * + * @param id 患者问卷题目提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionSubjectResultById(Long id) { + return patientQuestionSubjectResultMapper.deletePatientQuestionSubjectResultById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java new file mode 100644 index 00000000..c8535f0d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.patientquestionsubmitresult; + +import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; + +import java.util.List; + +/** + * 患者问卷提交结果信息Service接口 + * + * @author xinelu + * @date 2024-03-28 + */ +public interface IPatientQuestionSubmitResultService { + /** + * 查询患者问卷提交结果信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 患者问卷提交结果信息 + */ + PatientQuestionSubmitResult selectPatientQuestionSubmitResultById(Long id); + + /** + * 查询患者问卷提交结果信息列表 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 患者问卷提交结果信息集合 + */ + List selectPatientQuestionSubmitResultList(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 新增患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 修改患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult); + + /** + * 批量删除患者问卷提交结果信息 + * + * @param ids 需要删除的患者问卷提交结果信息主键集合 + * @return 结果 + */ + int deletePatientQuestionSubmitResultByIds(Long[] ids); + + /** + * 删除患者问卷提交结果信息信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 结果 + */ + int deletePatientQuestionSubmitResultById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java new file mode 100644 index 00000000..778b857d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java @@ -0,0 +1,93 @@ +package com.xinelu.manage.service.patientquestionsubmitresult.impl; + +import java.time.LocalDateTime; +import java.util.List; + +import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper; +import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService; + +import org.springframework.stereotype.Service; + + +import javax.annotation.Resource; + +/** + * 患者问卷提交结果信息Service业务层处理 + * + * @author xinelu + * @date 2024-03-28 + */ +@Service +public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionSubmitResultService { + @Resource + private PatientQuestionSubmitResultMapper patientQuestionSubmitResultMapper; + + /** + * 查询患者问卷提交结果信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 患者问卷提交结果信息 + */ + @Override + public PatientQuestionSubmitResult selectPatientQuestionSubmitResultById(Long id) { + return patientQuestionSubmitResultMapper.selectPatientQuestionSubmitResultById(id); + } + + /** + * 查询患者问卷提交结果信息列表 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 患者问卷提交结果信息 + */ + @Override + public List selectPatientQuestionSubmitResultList(PatientQuestionSubmitResult patientQuestionSubmitResult) { + return patientQuestionSubmitResultMapper.selectPatientQuestionSubmitResultList(patientQuestionSubmitResult); + } + + /** + * 新增患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + @Override + public int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) { + patientQuestionSubmitResult.setCreateTime(LocalDateTime.now()); + return patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult); + } + + /** + * 修改患者问卷提交结果信息 + * + * @param patientQuestionSubmitResult 患者问卷提交结果信息 + * @return 结果 + */ + @Override + public int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) { + patientQuestionSubmitResult.setUpdateTime(LocalDateTime.now()); + return patientQuestionSubmitResultMapper.updatePatientQuestionSubmitResult(patientQuestionSubmitResult); + } + + /** + * 批量删除患者问卷提交结果信息 + * + * @param ids 需要删除的患者问卷提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionSubmitResultByIds(Long[] ids) { + return patientQuestionSubmitResultMapper.deletePatientQuestionSubmitResultByIds(ids); + } + + /** + * 删除患者问卷提交结果信息信息 + * + * @param id 患者问卷提交结果信息主键 + * @return 结果 + */ + @Override + public int deletePatientQuestionSubmitResultById(Long id) { + return patientQuestionSubmitResultMapper.deletePatientQuestionSubmitResultById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java new file mode 100644 index 00000000..375d289b --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java @@ -0,0 +1,23 @@ +package com.xinelu.manage.vo.patientquestionsubjectresult; + +import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult; +import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 患者问卷题目提交结果信息对象 patient_question_subject_result + * + * @author xinelu + * @date 2024-03-28 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class PatientQuestionSubjectResultDTO extends PatientQuestionSubjectResult { + + private Long subjectResult; + + List optionResults; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java new file mode 100644 index 00000000..921e4826 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java @@ -0,0 +1,33 @@ +package com.xinelu.manage.vo.patientquestionsubmitresult; + + +import com.xinelu.manage.vo.patientquestionsubjectresult.PatientQuestionSubjectResultDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 患者问卷提交结果信息对象 patient_question_submit_result + * + * @author xinelu + * @date 2024-03-28 + */ +@Data +public class PatientQuestionSubmitResultDTO { + + private Long submitResulId; + /** + * 问卷标题 + */ + @ApiModelProperty(value = "问卷标题") + private String questionnaireName; + + /** + * 问卷说明 + */ + @ApiModelProperty(value = "问卷说明") + private String questionnaireDescription; + + List subjectResultList; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml new file mode 100644 index 00000000..b6b66f60 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, + question_subject_result_id, + questionnaire_subject_id, + question_name, + option_name, + option_answer, + option_score, + option_choose_sign, + option_submit_answer, + option_sort, + option_remark, + create_by, + create_time, + update_by, + update_time + from patient_question_option_result + + + + + + + + insert into patient_question_option_result + + question_subject_result_id, + + questionnaire_subject_id, + + question_name, + + option_name, + + option_answer, + + option_score, + + option_choose_sign, + + option_submit_answer, + + option_sort, + + option_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{questionSubjectResultId}, + + #{questionnaireSubjectId}, + + #{questionName}, + + #{optionName}, + + #{optionAnswer}, + + #{optionScore}, + + #{optionChooseSign}, + + #{optionSubmitAnswer}, + + #{optionSort}, + + #{optionRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_question_option_result + + question_subject_result_id = + #{questionSubjectResultId}, + + questionnaire_subject_id = + #{questionnaireSubjectId}, + + question_name = + #{questionName}, + + option_name = + #{optionName}, + + option_answer = + #{optionAnswer}, + + option_score = + #{optionScore}, + + option_choose_sign = + #{optionChooseSign}, + + option_submit_answer = + #{optionSubmitAnswer}, + + option_sort = + #{optionSort}, + + option_remark = + #{optionRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from patient_question_option_result + where id = #{id} + + + + delete from patient_question_option_result where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml new file mode 100644 index 00000000..afd43561 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + question_submit_result_id, + question_info_id, + question_number, + question_type, + question_name, + question_description, + write_description, + fill_blanks_answer, + option_count, + whether_score, + scoring_method, + scoring_description, + question_score, + question_sort, + question_remark, + create_by, + create_time, + update_by, + update_time + from patient_question_subject_result + + + + + + + + insert into patient_question_subject_result + + question_submit_result_id, + + question_info_id, + + question_number, + + question_type, + + question_name, + + question_description, + + write_description, + + fill_blanks_answer, + + option_count, + + whether_score, + + scoring_method, + + scoring_description, + + question_score, + + question_sort, + + question_remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{questionSubmitResultId}, + + #{questionInfoId}, + + #{questionNumber}, + + #{questionType}, + + #{questionName}, + + #{questionDescription}, + + #{writeDescription}, + + #{fillBlanksAnswer}, + + #{optionCount}, + + #{whetherScore}, + + #{scoringMethod}, + + #{scoringDescription}, + + #{questionScore}, + + #{questionSort}, + + #{questionRemark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_question_subject_result + + question_submit_result_id = + #{questionSubmitResultId}, + + question_info_id = + #{questionInfoId}, + + question_number = + #{questionNumber}, + + question_type = + #{questionType}, + + question_name = + #{questionName}, + + question_description = + #{questionDescription}, + + write_description = + #{writeDescription}, + + fill_blanks_answer = + #{fillBlanksAnswer}, + + option_count = + #{optionCount}, + + whether_score = + #{whetherScore}, + + scoring_method = + #{scoringMethod}, + + scoring_description = + #{scoringDescription}, + + question_score = + #{questionScore}, + + question_sort = + #{questionSort}, + + question_remark = + #{questionRemark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from patient_question_subject_result + where id = #{id} + + + + delete from patient_question_subject_result where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml new file mode 100644 index 00000000..52dd70ce --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + task_execute_record_id, + patient_id, + manage_route_id, + manage_route_node_id, + patient_name, + manage_route_name, + manage_route_node_name, + question_info_id, + department_id, + department_name, + disease_type_id, + disease_type_name, + questionnaire_name, + questionnaire_description, + answering_method, + questionnaire_id, + question_count, + questionnaire_total_score, + total_score, + remark, + create_by, + create_time, + update_by, + update_time + from patient_question_submit_result + + + + + + + + insert into patient_question_submit_result + + task_execute_record_id, + + patient_id, + + manage_route_id, + + manage_route_node_id, + + patient_name, + + manage_route_name, + + manage_route_node_name, + + question_info_id, + + department_id, + + department_name, + + disease_type_id, + + disease_type_name, + + questionnaire_name, + + questionnaire_description, + + answering_method, + + questionnaire_id, + + question_count, + + questionnaire_total_score, + + total_score, + + remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{taskExecuteRecordId}, + + #{patientId}, + + #{manageRouteId}, + + #{manageRouteNodeId}, + + #{patientName}, + + #{manageRouteName}, + + #{manageRouteNodeName}, + + #{questionInfoId}, + + #{departmentId}, + + #{departmentName}, + + #{diseaseTypeId}, + + #{diseaseTypeName}, + + #{questionnaireName}, + + #{questionnaireDescription}, + + #{answeringMethod}, + + #{questionnaireId}, + + #{questionCount}, + + #{questionnaireTotalScore}, + + #{totalScore}, + + #{remark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_question_submit_result + + task_execute_record_id = + #{taskExecuteRecordId}, + + patient_id = + #{patientId}, + + manage_route_id = + #{manageRouteId}, + + manage_route_node_id = + #{manageRouteNodeId}, + + patient_name = + #{patientName}, + + manage_route_name = + #{manageRouteName}, + + manage_route_node_name = + #{manageRouteNodeName}, + + question_info_id = + #{questionInfoId}, + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + disease_type_id = + #{diseaseTypeId}, + + disease_type_name = + #{diseaseTypeName}, + + questionnaire_name = + #{questionnaireName}, + + questionnaire_description = + #{questionnaireDescription}, + + answering_method = + #{answeringMethod}, + + questionnaire_id = + #{questionnaireId}, + + question_count = + #{questionCount}, + + questionnaire_total_score = + #{questionnaireTotalScore}, + + total_score = + #{totalScore}, + + remark = + #{remark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete + from patient_question_submit_result + where id = #{id} + + + + delete from patient_question_submit_result where id in + + #{id} + + + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index d7779776..ad5eae43 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -61,6 +61,7 @@ + @@ -68,7 +69,7 @@ - select id, manage_route_id, manage_route_name, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name, question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template__id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link, create_by, create_time, update_by, update_time from sign_patient_manage_route_node + select id, manage_route_id, manage_route_name, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name, question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template__id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link,text_remind_content, create_by, create_time, update_by, update_time from sign_patient_manage_route_node @@ -362,6 +366,8 @@ route_link, + text_remind_content, + create_by, create_time, @@ -482,6 +488,8 @@ #{routeLink}, + #{textRemindContent}, + #{createBy}, #{createTime}, @@ -499,7 +507,7 @@ message_template__id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, - route_handle_id, route_handle_person, route_link, create_by, create_time, update_by, update_time) + route_handle_id, route_handle_person, route_link, text_remind_content,create_by, create_time, update_by, update_time) values (#{item.manageRouteId},#{item.manageRouteName},#{item.routeNodeName},#{item.routeNodeDay},#{item.taskType},#{item.taskStatus},#{item.taskSubdivision},#{item.secondClassifyDescribe}, @@ -508,7 +516,7 @@ #{item.messageTemplateName},#{item.messagePreview},#{item.messageNodeContent},#{item.officialPushSign},#{item.officialTemplateId},#{item.officialTemplateName},#{item.officialRemindContent},#{item.officialNodeContent}, #{item.appletPushSign},#{item.appletTemplateId},#{item.appletTemplateName},#{item.appletRemindContent},#{item.appletPromptDescription},#{item.appletNodeContent},#{item.followTemplateId}, #{item.followTemplateName},#{item.followContent},#{item.routeCheckStatus},#{item.routeCheckPerson},#{item.routeCheckDate},#{item.routeCheckRemark},#{item.routeNodeRemark},#{item.nodeExecuteStatus},#{item.routeHandleRemark}, - #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) + #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.textRemindContent},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) @@ -679,6 +687,9 @@ route_link = #{routeLink}, + text_remind_content = + #{textRemindContent}, + create_by = #{createBy}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml index 08ad85e8..4f585002 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml @@ -80,5 +80,24 @@ AND street.parent_code = region.area_code AND community.parent_code = street.area_code AND community.area_code = #{areaCode} + UNION ALL + SELECT province.area_name province_name, + province.area_code province_code, + city.area_name city_name, + city.area_code city_code, + region.area_name region_name, + region.area_code region_code, + street.area_name street_name, + street.area_code street_code, + '' community_name, + '' community_code + FROM sys_area province, + sys_area city, + sys_area region, + sys_area street + WHERE city.parent_code = province.area_code + AND region.parent_code = city.area_code + AND street.parent_code = region.area_code + and street.area_code = #{areaCode} limit 1; From ab81503564c807fa18fc04c0def9feb35bafd13a Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 29 Mar 2024 11:05:56 +0800 Subject: [PATCH 27/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/VisitMethodConstants.java | 2 +- .../domain/patientinfo/PatientInfo.java | 4 +- .../PatientVisitRecord.java | 11 +++-- .../dto/patientinfo/PatientInfoDto.java | 8 ++-- .../PatientVisitRecordDto.java | 4 +- .../PatientVisitRecordImportDto.java | 5 ++- .../PatientVisitRecordInfoSaveDto.java | 8 ++-- .../PatientVisitRecordSaveDto.java | 4 +- .../propagandainfo/PropagandaInfoSaveDto.java | 5 +++ .../impl/PatientInfoServiceImpl.java | 36 ++++++++++++---- .../impl/PatientVisitRecordServiceImpl.java | 23 +++++----- .../impl/SignPatientRecordServiceImpl.java | 1 + .../PatientTaskExecuteRecordVO.java | 8 ++-- .../manage/patientinfo/PatientInfoMapper.xml | 42 +++++++++---------- 14 files changed, 97 insertions(+), 64 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java index 63455307..f1c892d8 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/VisitMethodConstants.java @@ -15,5 +15,5 @@ public class VisitMethodConstants { /** * 住院 */ - public static final String BE_HOSPITALIZED = "BE_HOSPITALIZED"; + public static final String BE_IN_HOSPITAL = "BE_IN_HOSPITAL"; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 905d5a0a..07711912 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -162,11 +162,11 @@ public class PatientInfo extends BaseEntity { /** 入院时间，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间") - private LocalDate admissionDate; + private LocalDateTime admissionTime; /** 出院时间（出院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "出院时间（出院患者）") - private LocalDate dischargeDate; + private LocalDateTime dischargeTime; /** 预约治疗组（取值以及枚举未知？） */ @ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index e878f411..437563c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -11,6 +11,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; /** * 患者就诊记录基本信息对象 patient_visit_record @@ -84,9 +85,9 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "民族") private String nation; - /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ - @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") - @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") + @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ @@ -168,18 +169,20 @@ public class PatientVisitRecord extends BaseEntity { /** 入院时间 */ @ApiModelProperty(value = "入院时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime dischargeTime; /** _记录时间（入院记录） */ @ApiModelProperty(value = "_记录时间") - @Excel(name = "_记录时间", readConverterExp = "入=院记录") + @Excel(name = "_记录时间", readConverterExp = "入院记录") private LocalDateTime recordTime; /** 门诊记录信息（就诊记录-门诊记录） */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index 3bfeb12f..25303c15 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -64,19 +64,19 @@ public class PatientInfoDto { /** 就诊时间开始（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间开始") - private LocalDate visitTimeStart; + private LocalDate visitDateStart; /** 就诊时间结束（门诊患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "就诊时间结束") - private LocalDate visitTimeEnd; + private LocalDate visitDateEnd; /** 入院时间开始，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间开始") - private LocalDate admissionDateStart; + private LocalDate admissionTimeStart; /** 入院时间结束，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间结束") - private LocalDate admissionDateEnd; + private LocalDate admissionTimeEnd; /** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "预约时间开始（预住院患者），时间格式：yyyy-MM-dd") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index d05e0491..6de4d3e2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -28,9 +28,9 @@ public class PatientVisitRecordDto { private Long hospitalAgencyId; /** - * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED + * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ - @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; @ApiModelProperty(value = "住院/门诊号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java index 61d061d0..37396012 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java @@ -5,6 +5,7 @@ import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.Data; /** @@ -35,12 +36,12 @@ public class PatientVisitRecordImportDto { /** 入院时间，时间格式：yyyy-MM-dd */ @ApiModelProperty(value = "入院时间") @Excel(name = "入院时间") - private LocalDate admissionDate; + private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") @Excel(name = "出院时间") - private LocalDate dischargeTime; + private LocalDateTime dischargeTime; /** 身份证号 */ @ApiModelProperty(value = "身份证号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java index 6b9f801f..cf30fa08 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java @@ -27,9 +27,9 @@ public class PatientVisitRecordInfoSaveDto { private Long patientId; /** - * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED + * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ - @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") @NotNull(message = "就诊类型不能为空") private String visitMethod; @@ -94,13 +94,13 @@ public class PatientVisitRecordInfoSaveDto { /** 入院时间 */ @ApiModelProperty(value = "入院时间") @NotNull(message = "入院时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") @NotNull(message = "出院时间不能为空") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime dischargeTime; @ApiModelProperty(value = "住院/门诊号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index eec7bc59..38728a2d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -53,8 +53,8 @@ public class PatientVisitRecordSaveDto { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate birthDate; - /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */ - @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED") + /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") @NotNull(message = "就诊类型不能为空") private String visitMethod; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java index ff289590..e6d3e0e9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoSaveDto.java @@ -15,6 +15,11 @@ import lombok.Data; @ApiModel("宣教库保存传输对象") @Data public class PropagandaInfoSaveDto { + + /** 主键id */ + @ApiModelProperty("主键id") + private Long id; + /** 所属医院id */ @ApiModelProperty(value = "所属医院id") private Long hospitalAgencyId; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 89bc10e5..c753e220 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -98,14 +98,34 @@ public class PatientInfoServiceImpl implements IPatientInfoService { */ @Override public int updatePatientInfo(PatientInfo patientInfo) { + ResidentInfo residentInfo = new ResidentInfo(); + if (patientInfo.getResidentId() != null) { + residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); + BeanUtils.copyBeanProp(residentInfo, patientInfo); + residentInfo.setId(patientInfo.getResidentId()); + residentInfoMapper.updateResidentInfo(residentInfo); + } else { + // 根据身份证号查询是否有该居民 + ResidentInfo residentQuery = new ResidentInfo(); + residentQuery.setCardNo(patientInfo.getCardNo()); + List residentList = residentInfoMapper.selectResidentInfoList(residentQuery); + if (CollectionUtils.isNotEmpty(residentList)) { + Long residentId = residentList.get(0).getId(); + residentInfo = residentList.get(0); + BeanUtils.copyBeanProp(residentInfo, patientInfo); + residentInfo.setId(residentId); + residentInfoMapper.updateResidentInfo(residentInfo); + } else { + BeanUtils.copyBeanProp(residentInfo, patientInfo); + residentInfo.setId(null); + residentInfoMapper.insertResidentInfo(residentInfo); + } + patientInfo.setResidentId(residentInfo.getId()); + } patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); - patientInfo.setUpdateTime(LocalDateTime.now()); + patientInfo.setUpdateTime(LocalDateTime.now()); patientInfo.setDelFlag(0); - patientInfoMapper.updatePatientInfo(patientInfo); - ResidentInfo residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); - BeanUtils.copyBeanProp(residentInfo, patientInfo); - residentInfo.setId(patientInfo.getResidentId()); - return residentInfoMapper.updateResidentInfo(residentInfo); + return patientInfoMapper.updatePatientInfo(patientInfo); } /** @@ -147,8 +167,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { patientInfo.setPatientType(null); patientInfo.setPatientVisitRecordId(null); patientInfo.setVisitMethod(null); - patientInfo.setAdmissionDate(null); - patientInfo.setDischargeDate(null); + patientInfo.setAdmissionTime(null); + patientInfo.setDischargeTime(null); patientInfo.setAttendingPhysicianId(null); patientInfo.setAttendingPhysicianName(null); patientInfo.setResponsibleNurse(null); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 5bde993b..2475234a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -58,8 +58,6 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Resource private DepartmentMapper departmentMapper; @Resource - private PatientInfoMapper patientInfoMapper; - @Resource private IPatientInfoService patientInfoService; /** @@ -105,7 +103,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService PatientInfoDto patientInfoDto = new PatientInfoDto(); patientInfoDto.setHospitalAgencyId(saveBody.getHospitalAgencyId()); patientInfoDto.setCardNo(saveBody.getCardNo()); - List patientInfoList = patientInfoMapper.selectPatientInfoList(patientInfoDto); + List patientInfoList = patientInfoService.selectPatientInfoList(patientInfoDto); // 患者档案信息新增/修改 PatientInfo patientInfo = new PatientInfo(); if(CollectionUtils.isEmpty(patientInfoList)) { @@ -133,7 +131,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 修改患者最近一次就诊记录id patientInfo.setPatientVisitRecordId(recordId); patientInfo.setVisitDate(saveBody.getVisitDate()); - patientInfoMapper.updatePatientInfo(patientInfo); + patientInfoService.updatePatientInfo(patientInfo); } private Long saveOrUpate(PatientVisitRecord patientVisitRecord) { @@ -144,6 +142,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService if (CollectionUtils.isEmpty(patientVisitRecordList)) { patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); + patientVisitRecord.setDelFlag(0); patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord); } else { patientVisitRecord.setId(patientVisitRecordList.get(0).getId()); @@ -168,6 +167,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); patientInfoService.updatePatientInfo(patientInfo); // 修改就诊记录信息 + patientVisitRecord.setResidentId(patientInfo.getResidentId()); return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); } @@ -184,6 +184,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); } BeanUtils.copyBeanProp(patientVisitRecord, saveDto); + patientVisitRecord.setDelFlag(0); patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientVisitRecord.setCreateTime(LocalDateTime.now()); setVisitDate(patientVisitRecord); @@ -280,7 +281,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService // 在院患者 case Constants.IN_HOSPITAL: case Constants.DISCHARGED: - patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_HOSPITALIZED); + patientVisitRecord.setVisitMethod(VisitMethodConstants.BE_IN_HOSPITAL); break; // 门诊患者 case Constants.OUTPATIENT: @@ -359,7 +360,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientMapper.insertPatientInfo(saveInfo); patientVisitRecord.setPatientId(saveInfo.getId()); } - + patientVisitRecord.setDelFlag(0); // 根据门诊/住院编号查询是否有记录 PatientVisitRecordDto recordQuery = new PatientVisitRecordDto(); recordQuery.setVisitMethod(patientType); @@ -386,7 +387,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Override public void setPatientType(PatientInfo patientInfo, PatientVisitRecord patientVisitRecord) { - if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { + if (StringUtils.equals(VisitMethodConstants.BE_IN_HOSPITAL, patientVisitRecord.getVisitMethod())) { // 住院患者：有出院时间，设置患者类型为出院，没有出院时间，设置患者类型为在院 if (patientVisitRecord.getDischargeTime() == null) { patientInfo.setPatientType(PatientTypeConstants.IN_HOSPITAL_PATIENT); @@ -405,10 +406,12 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService private void setVisitDate(PatientVisitRecord patientVisitRecord) { if (StringUtils.equals(VisitMethodConstants.OUTPATIENT_SERVICE, patientVisitRecord.getVisitMethod())) { patientVisitRecord.setVisitDate(patientVisitRecord.getDischargeTime()); - } else if (StringUtils.equals(VisitMethodConstants.BE_HOSPITALIZED, patientVisitRecord.getVisitMethod())) { + } else if (StringUtils.equals(VisitMethodConstants.BE_IN_HOSPITAL, patientVisitRecord.getVisitMethod())) { // 住院时间，出院时间-入院时间 - long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime()); - patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); + if (patientVisitRecord.getDischargeTime() != null) { + long daysBetween = ChronoUnit.DAYS.between(patientVisitRecord.getAdmissionTime(), patientVisitRecord.getDischargeTime()); + patientVisitRecord.setHospitalizationDays((int) daysBetween + 1); + } patientVisitRecord.setVisitDate(patientVisitRecord.getAdmissionTime()); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index b8d584d2..d8f208cb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -275,6 +275,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signRecord.setPatientId(patientInfo.getId()); signRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); signRecord.setCreateTime(LocalDateTime.now()); + signRecord.setId(null); int flag = signPatientRecordMapper.insertSelective(signRecord); if (flag > 0) { patientInfo.setSignPatientRecordId(signRecord.getId()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java index b13a3070..87fc4990 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java @@ -3,11 +3,11 @@ package com.xinelu.manage.vo.patienttaskexecuterecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.LocalDate; - /** * 患者管理任务执行记录对象 patient_task_execute_record @@ -60,11 +60,11 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord { @ApiModelProperty(value = "入院时间") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate admissionDate; + private LocalDateTime admissionTime; @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "出院时间（出院患者）") - private LocalDate dischargeDate; + private LocalDateTime dischargeTime; @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index 75060f03..612e8499 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -33,8 +33,8 @@ - - + + @@ -65,7 +65,7 @@ visit_method, attending_physician_id, attending_physician_name, main_diagnosis, hospital_agency_id, hospital_agency_name, campus_agency_id, campus_agency_name, department_id, department_name, ward_id, ward_name, responsible_nurse, patient_visit_record_id, visit_serial_number, - admission_date, discharge_date, appointment_treatment_group, + admission_time, discharge_time, appointment_treatment_group, registration_no, registration_date, appointment_date, in_hospital_number, visit_date, discharge_method, patient_source, del_flag, create_by, create_time, update_by, update_time from patient_info @@ -115,17 +115,17 @@ and visit_method = #{visitMethod} - - and visit_date >= #{visitTimeStart} + + and visit_date >= #{visitDateStart} - - and visit_date <= #{visitTimeEnd} + + and visit_date <= #{visitDateEnd} - - and admission_date >= #{admissionDateStart} + + and admission_time >= #{admissionTimeStart} - - and admission_date <= #{admissionDateEnd} + + and admission_time <= #{admissionTimeEnd} and appointment_date >= #{appointmentDateStart} @@ -227,11 +227,11 @@ visit_serial_number, - - admission_date, + + admission_time, - - discharge_date, + + discharge_time, appointment_treatment_group, @@ -317,9 +317,9 @@ #{visitSerialNumber}, - #{admissionDate}, + #{admissionTime}, - #{dischargeDate}, + #{dischargeTime}, #{appointmentTreatmentGroup}, @@ -435,11 +435,11 @@ visit_serial_number = #{visitSerialNumber}, - - admission_date = #{admissionDate}, + + admission_time = #{admissionTime}, - - discharge_date = #{dischargeDate}, + + discharge_time = #{dischargeTime}, appointment_treatment_group = #{appointmentTreatmentGroup}, From 3a1a013c991d92ea7abdc7a4ec016b26c33f1092 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 29 Mar 2024 13:19:55 +0800 Subject: [PATCH 28/32] =?UTF-8?q?=E6=82=A3=E8=80=85=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientTaskExecuteRecordController.java | 8 ++++++++ .../taskpartitiondict/TaskPartitionDict.java | 8 ++++++-- .../PatientQuestionSubmitResultMapper.java | 6 ++++++ .../PatientQuestionSubmitResultServiceImpl.java | 13 +++++-------- .../IPatientTaskExecuteRecordService.java | 8 ++++++++ .../impl/PatientTaskExecuteRecordServiceImpl.java | 14 ++++++++++++++ .../PatientQuestionSubjectResultDTO.java | 8 +++++++- .../PatientQuestionSubmitResultMapper.xml | 4 ++-- .../taskpartitiondict/TaskPartitionDictMapper.xml | 12 ++++++++++++ 9 files changed, 68 insertions(+), 13 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java index 6fefa55f..34c5485f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java @@ -84,4 +84,12 @@ public class PatientTaskExecuteRecordController extends BaseController { public AjaxResult selectVisitRecord(Long id) { return patientTaskExecuteRecordService.selectVisitRecord(id); } + + /** + * 根据任务执行记录查询患者问卷信息 + */ + @GetMapping("/selectPatientQuestionSubmit") + public AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId) { + return patientTaskExecuteRecordService.selectPatientQuestionSubmit(taskExecuteRecordId); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java index 8f3e886c..b2f1009e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java @@ -12,9 +12,7 @@ import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import java.sql.Time; import java.time.LocalTime; -import java.util.Date; /** * 任务细分字典对象 task_partition_dict @@ -99,6 +97,12 @@ public class TaskPartitionDict extends BaseEntity { @Excel(name = "任务细分模板内容") private String taskPartitionContent; + /** + * 模板类型 + */ + @ApiModelProperty(value = "模板类型") + @Excel(name = "模板类型") + private String templateType; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java index 11144866..35b296f4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java @@ -60,5 +60,11 @@ public interface PatientQuestionSubmitResultMapper { */ int deletePatientQuestionSubmitResultByIds(Long[] ids); + /** + * 根据任务执行记录查询患者问卷信息 + * + * @param taskExecuteRecordId 患者管理任务执行记录表id + * @return PatientQuestionSubmitResultDTO + */ PatientQuestionSubmitResultDTO selectResultByTaskExecuteRecordId(Long taskExecuteRecordId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java index 778b857d..2fab972b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java @@ -1,16 +1,13 @@ package com.xinelu.manage.service.patientquestionsubmitresult.impl; -import java.time.LocalDateTime; -import java.util.List; - import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper; import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService; - import org.springframework.stereotype.Service; - import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; /** * 患者问卷提交结果信息Service业务层处理 @@ -53,8 +50,8 @@ public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionS */ @Override public int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) { - patientQuestionSubmitResult.setCreateTime(LocalDateTime.now()); - return patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult); + patientQuestionSubmitResult.setCreateTime(LocalDateTime.now()); + return patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult); } /** @@ -65,7 +62,7 @@ public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionS */ @Override public int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) { - patientQuestionSubmitResult.setUpdateTime(LocalDateTime.now()); + patientQuestionSubmitResult.setUpdateTime(LocalDateTime.now()); return patientQuestionSubmitResultMapper.updatePatientQuestionSubmitResult(patientQuestionSubmitResult); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java index 891e2721..833daf7c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java @@ -68,4 +68,12 @@ public interface IPatientTaskExecuteRecordService { * @return AjaxResult */ AjaxResult selectVisitRecord(Long id); + + /** + * 根据任务执行记录查询患者问卷信息 + * + * @param taskExecuteRecordId 患者管理任务执行记录表id + * @return PatientQuestionSubmitResultDTO + */ + AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java index f0e16fd9..0235fd8a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.xinelu.manage.service.patienttaskexecuterecord.impl; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.utils.AgeUtil; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; +import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper; import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecordMapper; import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService; import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO; @@ -22,6 +23,8 @@ import java.util.List; public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteRecordService { @Resource private PatientTaskExecuteRecordMapper patientTaskExecuteRecordMapper; + @Resource + private PatientQuestionSubmitResultMapper submitResultMapper; /** * 查询患者管理任务执行记录 @@ -103,4 +106,15 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR patientTaskExecuteRecordVO.setAge(AgeUtil.getAgeMonth(patientTaskExecuteRecordVO.getBirthDate().toString())); return AjaxResult.success(patientTaskExecuteRecordVO); } + + /** + * 根据任务执行记录查询患者问卷信息 + * + * @param taskExecuteRecordId 患者管理任务执行记录表id + * @return PatientQuestionSubmitResultDTO + */ + @Override + public AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId) { + return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(taskExecuteRecordId)); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java index 375d289b..d703a015 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java @@ -17,7 +17,13 @@ import java.util.List; @Data public class PatientQuestionSubjectResultDTO extends PatientQuestionSubjectResult { - private Long subjectResult; + /* + * 患者问卷题目提交结果信息对象id + */ + private Long subjectResultId; + /** + * 选项表信息 + */ List optionResults; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml index 52dd70ce..e35f3962 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml @@ -34,7 +34,7 @@ - + - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml index d646c708..3b2c76a9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml @@ -15,6 +15,7 @@ + @@ -32,6 +33,7 @@ task_partition_sort, task_partition_remark, task_partition_content, + template_type, create_by, create_time, update_by, @@ -66,6 +68,9 @@ and task_partition_remark = #{taskPartitionRemark} + + and template_type = #{templateType} + @@ -105,6 +110,8 @@ update_time, + template_type, + #{taskTypeId}, @@ -133,6 +140,8 @@ #{updateTime}, + #{templateType}, + @@ -178,6 +187,9 @@ update_time = #{updateTime}, + template_type = + #{templateType}, + where id = #{id} From 92238dcd2b44999a9b6f36ecdeea011bdfe2a0bb Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 29 Mar 2024 16:38:50 +0800 Subject: [PATCH 29/32] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../questioninfo/QuestionInfoController.java | 8 +++ .../SpecialDiseaseNodeController.java | 12 ++-- .../SpecialDiseaseNode.java | 4 +- .../SpecialDiseaseNodeDTO.java | 34 ----------- .../questioninfo/QuestionInfoMapper.java | 10 ++++ .../SpecialDiseaseNodeMapper.java | 9 +-- .../SpecialDiseaseRouteMapper.java | 10 +++- .../questioninfo/IQuestionInfoService.java | 8 +++ .../impl/QuestionInfoServiceImpl.java | 23 +++++++ .../ISpecialDiseaseNodeService.java | 12 ++-- .../impl/SpecialDiseaseNodeServiceImpl.java | 43 +++---------- .../ISpecialDiseaseRouteService.java | 14 ++--- .../impl/SpecialDiseaseRouteServiceImpl.java | 6 +- .../SpecialDiseaseNodeVO.java | 20 +++++++ .../SpecialDiseaseRouteVO.java | 36 +++++++++++ .../TriggerConditionVO.java | 21 +++++++ .../PatientTaskExecuteRecordMapper.xml | 4 +- .../questioninfo/QuestionInfoMapper.xml | 14 +++++ .../SpecialDiseaseNodeMapper.xml | 36 ++--------- .../SpecialDiseaseRouteMapper.xml | 60 +++++++++++++++++++ 20 files changed, 253 insertions(+), 131 deletions(-) delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java index 888cba85..0ff43d1a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java @@ -105,4 +105,12 @@ public class QuestionInfoController extends BaseController { public AjaxResult updateQuestionByDepartment(@RequestBody QuestionInfo questionInfo) { return questionInfoService.updateQuestionByDepartment(questionInfo); } + + /** + * 科室问卷数量 + */ + @GetMapping("/departmentQuestionCount") + public AjaxResult departmentQuestionCount(String departmentName) { + return questionInfoService.departmentQuestionCount(departmentName); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java index 6ce168d8..b0906816 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java @@ -7,8 +7,8 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; -import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -66,7 +66,7 @@ public class SpecialDiseaseNodeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:add')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.INSERT) @PostMapping("/add") - public AjaxResult add(@RequestBody SpecialDiseaseNodeDTO specialDiseaseNode) { + public AjaxResult add(@RequestBody SpecialDiseaseRouteVO specialDiseaseNode) { return specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode); } @@ -76,7 +76,7 @@ public class SpecialDiseaseNodeController extends BaseController { @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:edit')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.UPDATE) @PutMapping("/edit") - public AjaxResult edit(@RequestBody SpecialDiseaseNodeDTO specialDiseaseNode) { + public AjaxResult edit(@RequestBody SpecialDiseaseRouteVO specialDiseaseNode) { return specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode); } @@ -91,10 +91,10 @@ public class SpecialDiseaseNodeController extends BaseController { } /** - * 查询专病路径-管理节点信息列表 - 触发条件列表 + * 查询专病路径-管理节点信息列表 */ @GetMapping("/selectSpecialDisease") - public AjaxResult selectSpecialDisease(Long routeId) { - return specialDiseaseNodeService.selectSpecialDisease(routeId); + public AjaxResult selectSpecialDisease(Long specialDiseaseRouteId) { + return specialDiseaseNodeService.selectSpecialDisease(specialDiseaseRouteId); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index b1acebfc..7cafed66 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -94,8 +94,8 @@ public class SpecialDiseaseNode extends BaseEntity { * 执行时间，格式：HH:mm */ @ApiModelProperty(value = "执行时间，格式：HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "HH:mm") + @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "HH:mm") private LocalTime executionTime; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java deleted file mode 100644 index aa30da24..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasenode/SpecialDiseaseNodeDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.xinelu.manage.dto.specialdiseasenode; - -import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; -import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; -import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * 专病路径-管理节点信息对象 special_disease_node - * - * @author xinelu - * @date 2024-03-13 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class SpecialDiseaseNodeDTO extends SpecialDiseaseRoute { - - @ApiModelProperty(value = "专病路径表id") - private Long routeId; - - /** - * 专病路径 - */ - List specialDiseaseNodeList; - - /** - * 节点信息 - */ - List triggerConditionList; -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java index 15a5d759..ae56a5a2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.questioninfo; import com.xinelu.manage.domain.questioninfo.QuestionInfo; +import com.xinelu.manage.vo.department.DepartmentVO; import java.util.List; @@ -59,4 +60,13 @@ public interface QuestionInfoMapper { * @return 结果 */ int deleteQuestionInfoByIds(Long[] ids); + + + /** + * 科室路径数量 + * + * @param departmentName 科室名称 + * @return DepartmentVO + */ + List departmentQuestionByDepartmentName(String departmentName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index 2385ef3b..cf792f8f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -1,7 +1,8 @@ package com.xinelu.manage.mapper.specialdiseasenode; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; -import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; +import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import java.util.List; @@ -61,7 +62,7 @@ public interface SpecialDiseaseNodeMapper { */ int deleteSpecialDiseaseNodeByIds(Long[] ids); - int insertSpecialDiseaseNodeList(List specialDiseaseNodeList); + int insertSpecialDiseaseNodeList(List specialDiseaseNodeList); /** * 删除专病路径-管理节点信息 @@ -75,8 +76,8 @@ public interface SpecialDiseaseNodeMapper { /** * 查询专病路径-管理节点信息 * - * @param routeId 专病路径-管理节点信息主键 + * @param specialDiseaseRouteId 专病路径-管理节点信息主键 * @return 专病路径-管理节点信息 */ - SpecialDiseaseNodeDTO selectSpecialDiseaseByRouteId(Long routeId); + SpecialDiseaseRouteVO selectSpecialDiseaseByRouteId(Long specialDiseaseRouteId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java index ae229a8c..4a822937 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java @@ -2,10 +2,10 @@ package com.xinelu.manage.mapper.specialdiseaseroute; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.vo.department.DepartmentVO; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import java.util.List; - /** * 专病路径信息Mapper接口 * @@ -68,4 +68,12 @@ public interface SpecialDiseaseRouteMapper { * @return DepartmentVO */ List departmentRouteByDepartmentName(String departmentName); + + /** + * 查询专病路径信息 + * + * @param id 专病路径信息主键 + * @return 专病路径信息 + */ + SpecialDiseaseRouteVO selectSpecialDiseaseRouteAndTriggerById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java index 8db3f5a9..fa8fe4c0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java @@ -68,4 +68,12 @@ public interface IQuestionInfoService { * @return 结果 */ AjaxResult updateQuestionByDepartment(QuestionInfo questionInfo); + + /** + * 科室问卷数量 + * + * @param departmentName 科室名称 + * @return AjaxResult + */ + AjaxResult departmentQuestionCount(String departmentName); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java index 6463ba2a..b28cbd1b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.xinelu.manage.mapper.questioninfo.QuestionInfoMapper; import com.xinelu.manage.mapper.questionsubject.QuestionSubjectMapper; import com.xinelu.manage.mapper.questionsubjectoption.QuestionSubjectOptionMapper; import com.xinelu.manage.service.questioninfo.IQuestionInfoService; +import com.xinelu.manage.vo.department.DepartmentVO; import com.xinelu.manage.vo.questionInfo.QuestionVO; import com.xinelu.manage.vo.questionsubject.QuestionSubjectVO; import com.xinelu.manage.vo.questionsubjectoption.QuestionSubjectOptionVO; @@ -279,4 +280,26 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { } return AjaxResult.success(questionCount); } + + /** + * 科室问卷数量 + * + * @param departmentName 科室名称 + * @return AjaxResult + */ + @Override + public AjaxResult departmentQuestionCount(String departmentName) { + DepartmentVO departmentVO = new DepartmentVO(); + List department = new ArrayList<>(); + departmentVO.setDepartmentName("全部"); + departmentVO.setCountNum(0); + List departmentVOS = questionInfoMapper.departmentQuestionByDepartmentName(departmentName); + if (CollectionUtils.isNotEmpty(departmentVOS)) { + Integer result = departmentVOS.stream().mapToInt(DepartmentVO::getCountNum).sum(); + departmentVO.setCountNum(result); + department.add(departmentVO); + department.addAll(departmentVOS); + } + return AjaxResult.success(department); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java index 84012f32..da781192 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java @@ -2,7 +2,7 @@ package com.xinelu.manage.service.specialdiseasenode; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; -import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import java.util.List; @@ -35,7 +35,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - AjaxResult insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); + AjaxResult insertSpecialDiseaseNode(SpecialDiseaseRouteVO specialDiseaseNode); /** * 修改专病路径-管理节点信息 @@ -43,7 +43,7 @@ public interface ISpecialDiseaseNodeService { * @param specialDiseaseNode 专病路径-管理节点信息 * @return 结果 */ - AjaxResult updateSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode); + AjaxResult updateSpecialDiseaseNode(SpecialDiseaseRouteVO specialDiseaseNode); /** * 批量删除专病路径-管理节点信息 @@ -62,10 +62,10 @@ public interface ISpecialDiseaseNodeService { int deleteSpecialDiseaseNodeById(Long id); /** - * 查询专病路径-管理节点信息列表 - 触发条件列表 + * 查询专病路径-管理节点信息列表 * - * @param routeId 路径id + * @param specialDiseaseRouteId 路径id * @return AjaxResult */ - AjaxResult selectSpecialDisease(Long routeId); + AjaxResult selectSpecialDisease(Long specialDiseaseRouteId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 419e6076..616eceb6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -6,12 +6,10 @@ import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; -import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; -import com.xinelu.manage.dto.specialdiseasenode.SpecialDiseaseNodeDTO; import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; -import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,7 +18,6 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; - /** * 专病路径-管理节点信息Service业务层处理 * @@ -34,8 +31,6 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService private SpecialDiseaseNodeMapper specialDiseaseNodeMapper; @Resource private SpecialDiseaseRouteMapper specialDiseaseRouteMapper; - @Resource - private SpecialDiseaseTriggerConditionMapper triggerConditionMapper; /** @@ -68,7 +63,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService */ @Transactional(rollbackFor = Exception.class) @Override - public AjaxResult insertSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + public AjaxResult insertSpecialDiseaseNode(SpecialDiseaseRouteVO specialDiseaseNode) { SpecialDiseaseRoute specialDiseaseRoute = new SpecialDiseaseRoute(); BeanUtils.copyBeanProp(specialDiseaseRoute, specialDiseaseNode); specialDiseaseRoute.setCreateTime(LocalDateTime.now()); @@ -86,15 +81,6 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService if (insertNodeCount < 0) { throw new ServiceException("新增专病路径管理节点信息失败"); } - for (SpecialDiseaseTriggerCondition triggerCondition : specialDiseaseNode.getTriggerConditionList()) { - triggerCondition.setRouteId(specialDiseaseRoute.getId()); - triggerCondition.setCreateTime(LocalDateTime.now()); - triggerCondition.setCreateBy(SecurityUtils.getUsername()); - } - int insertConditionCount = triggerConditionMapper.insertTriggerConditionList(specialDiseaseNode.getTriggerConditionList()); - if (insertConditionCount < 0) { - throw new ServiceException("新增专病路径管理节点信息失败"); - } return AjaxResult.success(); } @@ -106,7 +92,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService */ @Transactional(rollbackFor = Exception.class) @Override - public AjaxResult updateSpecialDiseaseNode(SpecialDiseaseNodeDTO specialDiseaseNode) { + public AjaxResult updateSpecialDiseaseNode(SpecialDiseaseRouteVO specialDiseaseNode) { SpecialDiseaseRoute specialDiseaseRoute = new SpecialDiseaseRoute(); BeanUtils.copyBeanProp(specialDiseaseRoute, specialDiseaseNode); specialDiseaseRoute.setUpdateTime(LocalDateTime.now()); @@ -131,21 +117,6 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService log.info("新增管理节点信息失败"); throw new ServiceException("修改专病路径管理节点信息失败"); } - int deleteConditionCont = triggerConditionMapper.deleteSpecialDiseaseTriggerConditionByRouteId(specialDiseaseRoute.getId()); - if (deleteConditionCont < 0) { - log.info("删除触发条件失败"); - throw new ServiceException("修改专病路径管理节点信息失败"); - } - for (SpecialDiseaseTriggerCondition triggerCondition : specialDiseaseNode.getTriggerConditionList()) { - triggerCondition.setRouteId(specialDiseaseRoute.getId()); - triggerCondition.setUpdateTime(LocalDateTime.now()); - triggerCondition.setUpdateBy(SecurityUtils.getUsername()); - } - int insertConditionCount = triggerConditionMapper.insertTriggerConditionList(specialDiseaseNode.getTriggerConditionList()); - if (insertConditionCount < 0) { - log.info("新增触发条件信息失败"); - throw new ServiceException("修改专病路径管理节点信息失败"); - } return AjaxResult.success(); } @@ -172,13 +143,13 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService } /** - * 查询专病路径-管理节点信息列表 - 触发条件列表 + * 查询专病路径-管理节点信息列表 * - * @param routeId 路径id + * @param specialDiseaseRouteId 路径id * @return AjaxResult */ @Override - public AjaxResult selectSpecialDisease(Long routeId) { - return AjaxResult.success(specialDiseaseNodeMapper.selectSpecialDiseaseByRouteId(routeId)); + public AjaxResult selectSpecialDisease(Long specialDiseaseRouteId) { + return AjaxResult.success(specialDiseaseNodeMapper.selectSpecialDiseaseByRouteId(specialDiseaseRouteId)); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java index aa1d1650..ec6433a0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java @@ -2,10 +2,10 @@ package com.xinelu.manage.service.specialdiseaseroute; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import java.util.List; - /** * 专病路径信息Service接口 * @@ -19,7 +19,7 @@ public interface ISpecialDiseaseRouteService { * @param id 专病路径信息主键 * @return 专病路径信息 */ - public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id); + SpecialDiseaseRouteVO selectSpecialDiseaseRouteById(Long id); /** * 查询专病路径信息列表 @@ -27,7 +27,7 @@ public interface ISpecialDiseaseRouteService { * @param specialDiseaseRoute 专病路径信息 * @return 专病路径信息集合 */ - public List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); + List selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute); /** * 新增专病路径信息 @@ -35,7 +35,7 @@ public interface ISpecialDiseaseRouteService { * @param specialDiseaseRoute 专病路径信息 * @return 结果 */ - public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); /** * 修改专病路径信息 @@ -43,7 +43,7 @@ public interface ISpecialDiseaseRouteService { * @param specialDiseaseRoute 专病路径信息 * @return 结果 */ - public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); + int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute); /** * 批量删除专病路径信息 @@ -51,7 +51,7 @@ public interface ISpecialDiseaseRouteService { * @param ids 需要删除的专病路径信息主键集合 * @return 结果 */ - public int deleteSpecialDiseaseRouteByIds(Long[] ids); + int deleteSpecialDiseaseRouteByIds(Long[] ids); /** * 删除专病路径信息信息 @@ -59,7 +59,7 @@ public interface ISpecialDiseaseRouteService { * @param id 专病路径信息主键 * @return 结果 */ - public int deleteSpecialDiseaseRouteById(Long id); + int deleteSpecialDiseaseRouteById(Long id); /** * 科室路径数量 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java index ac1d6d2e..a6b94cc8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -5,6 +5,7 @@ import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper; import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; import com.xinelu.manage.vo.department.DepartmentVO; +import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -13,7 +14,6 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; - /** * 专病路径信息Service业务层处理 * @@ -32,8 +32,8 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi * @return 专病路径信息 */ @Override - public SpecialDiseaseRoute selectSpecialDiseaseRouteById(Long id) { - return specialDiseaseRouteMapper.selectSpecialDiseaseRouteById(id); + public SpecialDiseaseRouteVO selectSpecialDiseaseRouteById(Long id) { + return specialDiseaseRouteMapper.selectSpecialDiseaseRouteAndTriggerById(id); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java new file mode 100644 index 00000000..932c2956 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java @@ -0,0 +1,20 @@ +package com.xinelu.manage.vo.specialdiseasenode; + +import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 专病路径-管理节点信息对象 special_disease_node + * + * @author xinelu + * @date 2024-03-13 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SpecialDiseaseNodeVO extends SpecialDiseaseNode { + + @ApiModelProperty(value = "专病路径表id") + private Long SpecialDiseaseNodeId; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java new file mode 100644 index 00000000..64972be2 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java @@ -0,0 +1,36 @@ +package com.xinelu.manage.vo.specialdiseaseroute; + +import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute; +import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO; +import com.xinelu.manage.vo.specialdiseasetriggercondition.TriggerConditionVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 专病路径信息对象 special_disease_route + * + * @author xinelu + * @date 2024-03-13 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class SpecialDiseaseRouteVO extends SpecialDiseaseRoute { + + /** + * 专病路径信息 + */ + private Long specialDiseaseRouteId; + + + /** + * 节点信息 + */ + List specialDiseaseNodeList; + + /** + * 节点信息 + */ + List triggerConditionList; +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java new file mode 100644 index 00000000..5ad22c33 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java @@ -0,0 +1,21 @@ +package com.xinelu.manage.vo.specialdiseasetriggercondition; + +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 触发条件关系DTO + * + * @author xinelu + * @date 2024-03-18 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class TriggerConditionVO extends SpecialDiseaseTriggerCondition { + + /** + * 触发条件id + */ + private Long triggerConditionId; +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml index 4c5846e3..0afc8613 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -108,8 +108,8 @@ pi.department_name, pi.ward_name, pi.visit_serial_number, - pi.admission_date, - pi.discharge_date, + pi.admission_time, + pi.discharge_time, pi.in_hospital_number, pi.patient_phone from patient_task_execute_record pter diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml index 43c798ea..51bd81a1 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml @@ -245,4 +245,18 @@ #{id} + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index f39c11bd..d2aa1e0f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -4,8 +4,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -20,8 +20,6 @@ - @@ -72,18 +70,6 @@ - - - - - - - - - - - - select id, route_id, @@ -702,7 +688,7 @@ \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml index 322c49a6..0b1d1af7 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml @@ -24,6 +24,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, department_id, @@ -248,4 +278,34 @@ GROUP BY dt.id + + \ No newline at end of file From 1c1bbcf87c0b650738f8b521c0edcb93ba0c3517 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 29 Mar 2024 17:26:15 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialdiseasenode/SpecialDiseaseNode.java | 7 +++++++ .../SpecialDiseaseNodeMapper.xml | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index 7cafed66..3c3b3e89 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -316,6 +316,13 @@ public class SpecialDiseaseNode extends BaseEntity { @Excel(name = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息") private String routeCheckRemark; + /** + * 节点内容 + */ + @ApiModelProperty(value = "节点内容") + @Excel(name = "节点内容") + private String nodeContent; + @Override public String toString() { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index d2aa1e0f..a0184146 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -64,6 +64,7 @@ + @@ -112,6 +113,7 @@ route_check_person, route_check_date, route_check_remark, + node_content, create_by, create_time, update_by, @@ -242,6 +244,9 @@ and route_check_remark = #{routeCheckRemark} + + and node_content = #{nodeContent} + @@ -343,6 +348,8 @@ update_time, + node_content, + #{routeId}, @@ -433,6 +440,8 @@ #{updateTime}, + #{nodeContent}, + @@ -571,6 +580,9 @@ update_time = #{updateTime}, + node_content = + #{nodeContent}, + where id = #{id} @@ -630,6 +642,7 @@ route_check_person, route_check_date, route_check_remark, + node_content, create_by, create_time ) values @@ -675,6 +688,7 @@ #{specialDiseaseNodeList.routeCheckPerson}, #{specialDiseaseNodeList.routeCheckDate}, #{specialDiseaseNodeList.routeCheckRemark}, + #{specialDiseaseNodeList.nodeContent}, #{specialDiseaseNodeList.createBy}, #{specialDiseaseNodeList.createTime} ) @@ -741,7 +755,8 @@ sdn.route_check_status, sdn.route_check_person, sdn.route_check_date, - sdn.route_check_remark + sdn.route_check_remark, + sdn.node_content from special_disease_route sdr left join special_disease_node sdn ON sdn.route_id = sdr.id where sdr.id = #{specialDiseaseRouteId} From 49412f3ba1b4642869a3c4a29d51b51e95d32b24 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 29 Mar 2024 17:31:44 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientinfo/PatientInfoController.java | 4 ++-- .../patientvisitrecord/PatientVisitRecord.java | 9 +++------ .../manage/domain/residentinfo/ResidentInfo.java | 11 +++++------ .../PatientVisitRecordSaveDto.java | 4 ++-- .../service/patientinfo/IPatientInfoService.java | 2 +- .../patientinfo/impl/PatientInfoServiceImpl.java | 5 +++-- .../impl/PatientPreHospitalizationServiceImpl.java | 7 ++----- .../impl/PatientVisitRecordServiceImpl.java | 14 +++++++++----- .../PatientVisitRecordMapper.xml | 4 ++-- 9 files changed, 29 insertions(+), 31 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 3071a896..4e17302b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -88,8 +88,8 @@ public class PatientInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')") @Log(title = "患者信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PatientInfo patientInfo) { - return toAjax(patientInfoService.updatePatientInfo(patientInfo)); + public R edit(@RequestBody PatientInfo patientInfo) { + return R.ok(patientInfoService.updatePatientInfo(patientInfo)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 437563c8..13553315 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -11,7 +11,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; /** * 患者就诊记录基本信息对象 patient_visit_record @@ -92,7 +91,7 @@ public class PatientVisitRecord extends BaseEntity { /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime visitDate; @@ -168,15 +167,13 @@ public class PatientVisitRecord extends BaseEntity { /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime dischargeTime; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java index 8cd45557..d55ecabd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java @@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,11 +43,10 @@ public class ResidentInfo extends BaseEntity { @Excel(name = "家属电话") private String familyMemberPhone; - /** 出生日期，格式：yyyy-MM-dd */ - @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthDate; + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate birthDate; /** 身份证号 */ @ApiModelProperty(value = "身份证号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index 38728a2d..d42102d7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -111,12 +111,12 @@ public class PatientVisitRecordSaveDto { /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime dischargeTime; /** _记录时间（入院记录） */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index 2d4d5f7f..c8f70f83 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -41,7 +41,7 @@ public interface IPatientInfoService { * @param patientInfo 患者信息 * @return 结果 */ - public int updatePatientInfo(PatientInfo patientInfo); + public PatientInfo updatePatientInfo(PatientInfo patientInfo); /** * 批量删除患者信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index c753e220..16070f4f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -97,7 +97,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { * @return 结果 */ @Override - public int updatePatientInfo(PatientInfo patientInfo) { + public PatientInfo updatePatientInfo(PatientInfo patientInfo) { ResidentInfo residentInfo = new ResidentInfo(); if (patientInfo.getResidentId() != null) { residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); @@ -125,7 +125,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setUpdateTime(LocalDateTime.now()); patientInfo.setDelFlag(0); - return patientInfoMapper.updatePatientInfo(patientInfo); + patientInfoMapper.updatePatientInfo(patientInfo); + return patientInfo; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index 5c9561c2..934ceb68 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -101,11 +101,8 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital Long patientId = patientInfo.getId(); BeanUtils.copyBeanProp(patientInfo, preHospitalization); patientInfo.setId(patientId); - int flag = patientInfoService.updatePatientInfo(patientInfo); - if (flag >= 0) { - return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); - } - return flag; + patientInfoService.updatePatientInfo(patientInfo); + return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 2475234a..b63178ae 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -92,7 +92,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Transactional(rollbackFor = Exception.class) public void insertPatientVisitRecord(PatientVisitRecordSaveDto saveDto) { // 根据机构id、患者身份证号判断门诊/住院号是否重复 - PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), null, saveDto.getInHospitalNumber()); + PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), saveDto.getCardNo(), saveDto.getInHospitalNumber()); if (ObjectUtils.isNotEmpty(patientVisitRecord)) { throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); } @@ -113,8 +113,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientInfo.setDelFlag(0); patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setCreateTime(LocalDateTime.now()); - patientInfoService.insertPatientInfo(patientInfo); - saveBody.setPatientId(patientInfo.getId()); + PatientInfo patientSave = patientInfoService.insertPatientInfo(patientInfo); + saveBody.setPatientId(patientSave.getId()); + saveBody.setResidentId(patientSave.getResidentId()); } else { patientInfo = patientInfoList.get(0); Long patientId = patientInfo.getId(); @@ -163,11 +164,14 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService } // 修改患者基本信息 PatientInfo patientInfo = patientMapper.selectPatientInfoById(patientVisitRecord.getPatientId()); + Long residentId = patientInfo.getResidentId(); setVisitDate(patientVisitRecord); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); - patientInfoService.updatePatientInfo(patientInfo); + patientInfo.setId(patientVisitRecord.getPatientId()); + patientInfo.setResidentId(residentId); + PatientInfo afterUpd = patientInfoService.updatePatientInfo(patientInfo); // 修改就诊记录信息 - patientVisitRecord.setResidentId(patientInfo.getResidentId()); + patientVisitRecord.setResidentId(afterUpd.getResidentId()); return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 474242a4..30bc02e3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -81,10 +81,10 @@ and in_hospital_number = #{inHospitalNumber} - and visit_date >= #{visitDateStart} + and date_format(visit_date,'%y%m%d') >= date_format(#{visitDateStart},'%y%m%d') - and visit_date <= #{visitDateEnd} + and date_format(visit_date,'%y%m%d') <= date_format(#{visitDateEnd},'%y%m%d') order by visit_date desc From 6560540c4a8b5349181369edca3af58376402506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BA=AA=E5=AF=92?= <2533659732@qq.com> Date: Mon, 1 Apr 2024 10:26:15 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/common/constant/Constants.java | 32 +- .../domain/patientinfo/PatientInfo.java | 209 ++-- .../mapper/patientinfo/PatientInfoMapper.java | 9 +- .../manage/patientinfo/PatientInfoMapper.xml | 921 +++++++++--------- 4 files changed, 628 insertions(+), 543 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index 7e48add1..38f7bd83 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -194,25 +194,25 @@ public class Constants { */ public static final String TASK_STATUS_CODE = "TSC"; - /** - * 门诊患者 - */ - public static final String OUTPATIENT = "outpatient"; + /** + * 门诊患者 + */ + public static final String OUTPATIENT = "outpatient"; - /** - * 预住院 - */ - public static final String PRE_HOSPITALIZED = "prehospitalized"; + /** + * 预住院 + */ + public static final String PRE_HOSPITALIZED = "prehospitalized"; - /** - * 在院 - */ - public static final String IN_HOSPITAL = "inhospital"; + /** + * 在院 + */ + public static final String IN_HOSPITAL = "inhospital"; - /** - * 出院 - */ - public static final String DISCHARGED = "discharged"; + /** + * 出院 + */ + public static final String DISCHARGED = "discharged"; /** * 字段信息编码前缀 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 07711912..7269bcd5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -5,13 +5,14 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 患者信息对象 patient_info * @@ -25,187 +26,261 @@ import lombok.NoArgsConstructor; @ApiModel(value = "患者信息对象", description = "patient_info") public class PatientInfo extends BaseEntity { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; - /** 主键id */ + /** + * 主键id + */ private Long id; - /** 居民信息表id */ - @ApiModelProperty(value = "居民信息表id") - private Long residentId; + /** + * 居民信息表id + */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; - /** 患者姓名 */ + /** + * 患者姓名 + */ @ApiModelProperty(value = "患者姓名") @Excel(name = "患者姓名") private String patientName; - /** 患者电话 */ + /** + * 患者电话 + */ @ApiModelProperty(value = "患者电话") @Excel(name = "患者电话") private String patientPhone; - /** 家属电话 */ + /** + * 家属电话 + */ @ApiModelProperty(value = "家属电话") private String familyMemberPhone; - /** 出生日期，格式：yyyy-MM-dd */ + /** + * 出生日期，格式：yyyy-MM-dd + */ @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate birthDate; - /** 身份证号 */ + /** + * 身份证号 + */ @ApiModelProperty(value = "身份证号") private String cardNo; - /** 性别，男：MALE，女：FEMALE */ + /** + * 性别，男：MALE，女：FEMALE + */ @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") @Excel(name = "性别，男：MALE，女：FEMALE") private String sex; - /** 住址 */ + /** + * 住址 + */ @ApiModelProperty(value = "住址") @Excel(name = "住址") private String address; - /** 患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT， -签约患者：CONTRACTED_PATIENT */ + /** + * 患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT， + * 签约患者：CONTRACTED_PATIENT + */ @ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT") private String patientType; - /** - * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务到期：EXPIRE_SIGN - */ - @ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") - private String signStatus; + /** + * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务到期：EXPIRE_SIGN + */ + @ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") + private String signStatus; - @ApiModelProperty(value = "签约记录表id") - private Long signPatientRecordId; + @ApiModelProperty(value = "签约记录表id") + private Long signPatientRecordId; - /** - * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END - */ - @ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END") - private String serviceStatus; + /** + * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END + */ + @ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END") + private String serviceStatus; - /** 签约时间，格式：yyyy-MM-dd HH:mm:ss */ + /** + * 签约时间，格式：yyyy-MM-dd HH:mm:ss + */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "签约时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime signTime; - /** 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ + /** + * 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL + */ @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") @Excel(name = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; - /** 主治医生id */ - @ApiModelProperty(value = "主治医生id") - @Excel(name = "主治医生id") - private Long attendingPhysicianId; + /** + * 主治医生id + */ + @ApiModelProperty(value = "主治医生id") + @Excel(name = "主治医生id") + private Long attendingPhysicianId; - /** 主治医生姓名 */ - @ApiModelProperty(value = "主治医生姓名") - @Excel(name = "主治医生姓名") - private String attendingPhysicianName; + /** + * 主治医生姓名 + */ + @ApiModelProperty(value = "主治医生姓名") + @Excel(name = "主治医生姓名") + private String attendingPhysicianName; - /** 主要诊断 */ + /** + * 主要诊断 + */ @ApiModelProperty(value = "主要诊断") private String mainDiagnosis; - /** 所属医院id */ + /** + * 所属医院id + */ @ApiModelProperty(value = "所属医院id") private Long hospitalAgencyId; - /** 所属医院名称 */ + /** + * 所属医院名称 + */ @ApiModelProperty(value = "所属医院名称") @Excel(name = "所属医院名称") private String hospitalAgencyName; - /** 所属院区id */ + /** + * 所属院区id + */ @ApiModelProperty(value = "所属院区id") private Long campusAgencyId; - /** 所属院区名称 */ + /** + * 所属院区名称 + */ @ApiModelProperty(value = "所属院区名称") @Excel(name = "所属院区名称") private String campusAgencyName; - /** 所属科室id */ + /** + * 所属科室id + */ @ApiModelProperty(value = "所属科室id") private Long departmentId; - /** 所属科室名称 */ + /** + * 所属科室名称 + */ @ApiModelProperty(value = "所属科室名称") @Excel(name = "所属科室名称") private String departmentName; - /** 所属病区id */ + /** + * 所属病区id + */ @ApiModelProperty(value = "所属病区id") private Long wardId; - /** 所属病区名称 */ + /** + * 所属病区名称 + */ @ApiModelProperty(value = "所属病区名称") @Excel(name = "所属病区名称") private String wardName; - /** 责任护士 */ + /** + * 责任护士 + */ @ApiModelProperty(value = "责任护士") private String responsibleNurse; - /** 最新一条就诊记录id */ - @ApiModelProperty(value = "最新一条就诊记录id") - private Long patientVisitRecordId; + /** + * 最新一条就诊记录id + */ + @ApiModelProperty(value = "最新一条就诊记录id") + private Long patientVisitRecordId; - /** 就诊流水号 */ + /** + * 就诊流水号 + */ @ApiModelProperty(value = "就诊流水号") private String visitSerialNumber; - /** 入院时间，时间格式：yyyy-MM-dd */ + /** + * 入院时间，时间格式：yyyy-MM-dd + */ @ApiModelProperty(value = "入院时间") private LocalDateTime admissionTime; - /** 出院时间（出院患者），时间格式：yyyy-MM-dd */ + /** + * 出院时间（出院患者），时间格式：yyyy-MM-dd + */ @ApiModelProperty(value = "出院时间（出院患者）") private LocalDateTime dischargeTime; - /** 预约治疗组（取值以及枚举未知？） */ + /** + * 预约治疗组（取值以及枚举未知？） + */ @ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）") private String appointmentTreatmentGroup; - /** 登记号（预住院患者） */ + /** + * 登记号（预住院患者） + */ @ApiModelProperty(value = "登记号（预住院患者）") private String registrationNo; - /** 登记日期（预住院患者），时间格式：yyyy-MM-dd */ + /** + * 登记日期（预住院患者），时间格式：yyyy-MM-dd + */ @ApiModelProperty(value = "登记日期（预住院患者），时间格式：yyyy-MM-dd") private LocalDate registrationDate; - /** 预约时间（预住院患者），时间格式：yyyy-MM-dd */ + /** + * 预约时间（预住院患者），时间格式：yyyy-MM-dd + */ @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd") private LocalDate appointmentDate; - /** 门诊/住院号 */ + /** + * 门诊/住院号 + */ @ApiModelProperty(value = "门诊/住院号 ") @Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ") private String inHospitalNumber; - /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ - @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") - private LocalDateTime visitDate; + /** + * 就诊时间，格式：yyyy-MM-dd HH:mm:ss + */ + @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDateTime visitDate; - /** 出院方式（出院患者） */ + /** + * 出院方式（出院患者） + */ @ApiModelProperty(value = "出院方式") @Excel(name = "出院方式", readConverterExp = "出=院患者") private String dischargeMethod; - /** 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END */ + /** + * 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END + */ @ApiModelProperty(value = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END") @Excel(name = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END") private String patientSource; - /** 删除标识，0：未删除，1：已删除 */ + /** + * 删除标识，0：未删除，1：已删除 + */ private Integer delFlag; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java index 4f34621f..bf7905c2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java @@ -3,6 +3,7 @@ package com.xinelu.manage.mapper.patientinfo; import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo; + import java.util.List; /** @@ -20,7 +21,13 @@ public interface PatientInfoMapper { */ public PatientInfo selectPatientInfoById(Long id); - public PatientBaseInfoVo getPatientBaseInfo(Long id); + /** + * 查询患者信息 + * + * @param id 主键id + * @return 患者信息 + */ + public PatientBaseInfoVo getPatientBaseInfo(Long id); /** * 查询患者信息列表 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index 612e8499..dca7f846 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -1,56 +1,56 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + select id,resident_id, patient_name, patient_phone, @@ -71,428 +71,431 @@ from patient_info - + - + - select id, resident_id, patient_name, patient_phone, family_member_phone, birth_date, card_no, sex, address from patient_info where id = #{id} - - insert into patient_info - - - resident_id, - - - patient_name, - - patient_phone, - - family_member_phone, - - birth_date, - - card_no, - - sex, - - address, - - patient_type, - - sign_status, - - sign_patient_record_id, - - service_status, - - sign_time, - - visit_method, - - attending_physician_id, - - attending_physician_name, - - main_diagnosis, - - hospital_agency_id, - - hospital_agency_name, - - campus_agency_id, - - campus_agency_name, - - department_id, - - department_name, - - ward_id, - - ward_name, - - - responsible_nurse, - - - patient_visit_record_id, - - - visit_serial_number, - - - admission_time, - - - discharge_time, - - appointment_treatment_group, - - registration_no, - - registration_date, - - appointment_date, - - in_hospital_number, - - visit_date, - - discharge_method, - - patient_source, - - del_flag, - - create_by, - - create_time, - - update_by, - - update_time, - - - - #{residentId}, - - #{patientName}, - - #{patientPhone}, - - #{familyMemberPhone}, - - #{birthDate}, - - #{cardNo}, - - #{sex}, - - #{address}, - - #{patientType}, - - #{signStatus}, - - #{signPatientRecordId}, - - #{serviceStatus}, - - #{signTime}, - - #{visitMethod}, - - #{attendingPhysicianId}, - - #{attendingPhysicianName}, - - #{mainDiagnosis}, - - #{hospitalAgencyId}, - - #{hospitalAgencyName}, - - #{campusAgencyId}, - - #{campusAgencyName}, - - #{departmentId}, - - #{departmentName}, - - #{wardId}, - - #{wardName}, - - #{responsibleNurse}, - - #{patientVisitRecordId}, - - #{visitSerialNumber}, - - #{admissionTime}, - - #{dischargeTime}, - - #{appointmentTreatmentGroup}, - - #{registrationNo}, - - #{registrationDate}, - - #{appointmentDate}, - - #{inHospitalNumber}, - - #{visitDate}, - - #{dischargeMethod}, - - #{patientSource}, - - #{delFlag}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - - - + + insert into patient_info + + + resident_id, + + + patient_name, + + patient_phone, + + family_member_phone, + + birth_date, + + card_no, + + sex, + + address, + + patient_type, + + sign_status, + + sign_patient_record_id, + + service_status, + + sign_time, + + visit_method, + + attending_physician_id, + + attending_physician_name, + + main_diagnosis, + + hospital_agency_id, + + hospital_agency_name, + + campus_agency_id, + + campus_agency_name, + + department_id, + + department_name, + + ward_id, + + ward_name, + + + responsible_nurse, + + + patient_visit_record_id, + + + visit_serial_number, + + + admission_time, + + + discharge_time, + + appointment_treatment_group, + + registration_no, + + registration_date, + + appointment_date, + + in_hospital_number, + + visit_date, + + discharge_method, + + patient_source, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{residentId}, + + #{patientName}, + + #{patientPhone}, + + #{familyMemberPhone}, + + #{birthDate}, + + #{cardNo}, + + #{sex}, + + #{address}, + + #{patientType}, + + #{signStatus}, + + #{signPatientRecordId}, + + #{serviceStatus}, + + #{signTime}, + + #{visitMethod}, + + #{attendingPhysicianId}, + + #{attendingPhysicianName}, + + #{mainDiagnosis}, + + #{hospitalAgencyId}, + + #{hospitalAgencyName}, + + #{campusAgencyId}, + + #{campusAgencyName}, + + #{departmentId}, + + #{departmentName}, + + #{wardId}, + + #{wardName}, + + #{responsibleNurse}, + + #{patientVisitRecordId}, + + #{visitSerialNumber}, + + #{admissionTime}, + + #{dischargeTime}, + + #{appointmentTreatmentGroup}, + + #{registrationNo}, + + #{registrationDate}, + + #{appointmentDate}, + + #{inHospitalNumber}, + + #{visitDate}, + + #{dischargeMethod}, + + #{patientSource}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + - - update patient_info - - - resident_id = #{residentId}, - - - patient_name = #{patientName}, - - - patient_phone = #{patientPhone}, - - - family_member_phone = #{familyMemberPhone}, - - - birth_date = #{birthDate}, - - - card_no = #{cardNo}, - - - sex = #{sex}, - - - address = #{address}, - - - patient_type = #{patientType}, - - sign_status = - #{signStatus}, - - sign_patient_record_id = #{signPatientRecordId}, - - service_status = #{serviceStatus}, - - sign_time = - #{signTime}, - - visit_method = - #{visitMethod}, - - attending_physician_id = - #{attendingPhysicianId}, - - attending_physician_name = - #{attendingPhysicianName}, - - main_diagnosis = - #{mainDiagnosis}, - - hospital_agency_id = - #{hospitalAgencyId}, - - hospital_agency_name = - #{hospitalAgencyName}, - - campus_agency_id = - #{campusAgencyId}, - - campus_agency_name = - #{campusAgencyName}, - - department_id = - #{departmentId}, - - department_name = - #{departmentName}, - - ward_id = - #{wardId}, - - ward_name = - #{wardName}, - - responsible_nurse = - #{responsibleNurse}, - - patient_visit_record_id = - #{patientVisitRecordId}, - - visit_serial_number = - #{visitSerialNumber}, - - - admission_time = #{admissionTime}, - - - discharge_time = #{dischargeTime}, - - appointment_treatment_group = - #{appointmentTreatmentGroup}, - - registration_no = - #{registrationNo}, - - registration_date = - #{registrationDate}, - - appointment_date = - #{appointmentDate}, - - in_hospital_number = - #{inHospitalNumber}, - - visit_date = - #{visitDate}, - - discharge_method = - #{dischargeMethod}, - - patient_source = - #{patientSource}, - - del_flag = - #{delFlag}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - - - where id = #{id} - + + update patient_info + + + resident_id = #{residentId}, + + + patient_name = #{patientName}, + + + patient_phone = #{patientPhone}, + + + family_member_phone = #{familyMemberPhone}, + + + birth_date = #{birthDate}, + + + card_no = #{cardNo}, + + + sex = #{sex}, + + + address = #{address}, + + + patient_type = #{patientType}, + + sign_status = + #{signStatus}, + + sign_patient_record_id = #{signPatientRecordId}, + + service_status = #{serviceStatus}, + + sign_time = + #{signTime}, + + visit_method = + #{visitMethod}, + + attending_physician_id = + #{attendingPhysicianId}, + + attending_physician_name = + #{attendingPhysicianName}, + + main_diagnosis = + #{mainDiagnosis}, + + hospital_agency_id = + #{hospitalAgencyId}, + + hospital_agency_name = + #{hospitalAgencyName}, + + campus_agency_id = + #{campusAgencyId}, + + campus_agency_name = + #{campusAgencyName}, + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + ward_id = + #{wardId}, + + ward_name = + #{wardName}, + + responsible_nurse = + #{responsibleNurse}, + + patient_visit_record_id = + #{patientVisitRecordId}, + + visit_serial_number = + #{visitSerialNumber}, + + + admission_time = #{admissionTime}, + + + discharge_time = #{dischargeTime}, + + appointment_treatment_group = + #{appointmentTreatmentGroup}, + + registration_no = + #{registrationNo}, + + registration_date = + #{registrationDate}, + + appointment_date = + #{appointmentDate}, + + in_hospital_number = + #{inHospitalNumber}, + + visit_date = + #{visitDate}, + + discharge_method = + #{dischargeMethod}, + + patient_source = + #{patientSource}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + - + update patient_info set del_flag = 1 where id = #{id} - - update patient_info set del_flag = 1 where id in - - #{id} - - + + update patient_info set del_flag = 1 where id in + + #{id} + + \ No newline at end of file