责任中心列表返回

src/main/java/com/imed/costaccount/model/dto/DepartmentRequest.java

@@ -23,6 +23,5 @@ public class DepartmentRequest {
     @NotNull(message = "科室Id不能为空")
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")
-    @NotNull(message = "医院Id不能为空")
     private Integer hospId;
 }

src/main/java/com/imed/costaccount/service/impl/CostResponsibilityDepartmentServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 
-@Service("costResponsibilityDepartmentService")
+@Service("/costResponsibilityDepartmentService")
 public class CostResponsibilityDepartmentServiceImpl extends ServiceImpl<CostResponsibilityDepartmentMapper, CostResponsibilityDepartment> implements CostResponsibilityDepartmentService {
 
     @Autowired

src/main/java/com/imed/costaccount/service/impl/DepartmentServiceImpl.java

@@ -9,10 +9,14 @@ import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.DepartmentMapper;
 import com.imed.costaccount.model.Department;
+import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartmentRequest;
 import com.imed.costaccount.model.vo.DepartmentVO;
 import com.imed.costaccount.service.DepartmentService;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
@@ -65,11 +69,14 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     /**
      * 保存科室信息
-     *
+     * TODO 检验科室信息是否存在
      * @param departmentRequest
      */
     @Override
     public void addDepartment(DepartmentRequest departmentRequest) {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        departmentRequest.setHospId(hospId);
         Department department = BeanUtil.convertObj(departmentRequest, Department.class);
         department.setId(null);
         department.setCreateTime(System.currentTimeMillis());
@@ -82,7 +89,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @param departmentRequest
      */
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void updateByDepartment(DepartmentRequest departmentRequest) {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
         Integer id = departmentRequest.getId();
         Department department = baseMapper.selectById(id);
         if (Objects.isNull(department)){
@@ -93,6 +103,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         Department departmentResponse = BeanUtil.convertObj(departmentRequest, Department.class);
         departmentResponse.setId(null);
         departmentResponse.setCreateTime(System.currentTimeMillis());
+        departmentResponse.setHospId(hospId);
         baseMapper.insert(departmentResponse);
     }
 }

src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -70,6 +70,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void saveHosptail(HospitalSaveDto hospitalSaveDto) {
         String sign = hospitalSaveDto.getSign();
+        //  检验此时保存的是医院还是院区
         checkParam(hospitalSaveDto, sign);
         Hospital hospital = BeanUtil.convertObj(hospitalSaveDto, Hospital.class);
         hospital.setCreateTime(System.currentTimeMillis());
@@ -166,7 +167,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
         Hospital one = this.getOne(
                 new LambdaQueryWrapper<Hospital>()
                         .select(Hospital::getId, Hospital::getName)
-                        .eq(Hospital::getIsHospital, 1)
+                        .eq(Hospital::getIsHospital, 0)
                         .eq(Hospital::getSign, hospSign)
                         .last("limit 1")
         );

src/main/java/com/imed/costaccount/web/CostResponsibilityDepartmentController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @date 2021-07-27 15:59:58
  */
 @RestController
-@RequestMapping("/costresponsibilitydepartment")
+@RequestMapping("/costAccount/costresponsibilitydepartment")
 @Api(tags = "责任中心科室对照表")
 public class CostResponsibilityDepartmentController {
     @Autowired

src/main/java/com/imed/costaccount/web/CostShareLevelController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @date 2021-07-27 14:19:09
  */
 @RestController
-@RequestMapping("/costsharelevel")
+@RequestMapping("/costAccount/costsharelevel")
 @Api(tags = "分摊层级相关操作")
 public class CostShareLevelController {
     @Autowired

src/main/java/com/imed/costaccount/web/CostShareParamController.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @date 2021-07-28 09:23:28
  */
 @RestController
-@RequestMapping("/costshareparam")
+@RequestMapping("/costAccount/costshareparam")
 @Api(tags = "成本参数操作")
 public class CostShareParamController {
     @Autowired

src/main/java/com/imed/costaccount/web/DepartmentController.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @date 2021-07-27 08:49:37
  */
 @RestController
-@RequestMapping("/department")
+@RequestMapping("/costAccount/department")
 @Api(tags = "科室信息管理")
 
 public class DepartmentController {
@@ -65,6 +65,7 @@ public class DepartmentController {
     @PostMapping("/save")
     @ApiOperation("保存科室相关信息")
     public Result save(@RequestBody @Valid DepartmentRequest departmentRequest){
+
 		departmentService.addDepartment(departmentRequest);
         return Result.ok();
     }

src/main/java/com/imed/costaccount/web/HospitalController.java

@@ -46,7 +46,7 @@ public class HospitalController {
      */
     @GetMapping("/list")
     @ApiOperation("分页查询医院信息")
-    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+    public Result list(@RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();

src/main/java/com/imed/costaccount/web/ResponsibilityController.java

@@ -1,5 +1,6 @@
 package com.imed.costaccount.web;
 
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ResponsibilityEditDTO;
@@ -33,7 +34,9 @@ public class ResponsibilityController {
     public Result list() {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         List<CostResponsibilityVO> list = responsibilityService.getList(user);
-        return Result.ok(list);
+        PageUtils pageUtils = new PageUtils(list,0,0,0);
+
+        return Result.ok(pageUtils);
     }
 
     @ApiOperation("新增责任中心")