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