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