Merge branch 'master' of huangrui/CostAccount into dev

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.model.dto;
 
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -10,12 +11,14 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
-@ApiModel
+@ApiModel("会计科目、成本对照入参")
 public class AccountProductSaveDTO {
 
+    @ApiModelProperty(name="id",value = "会计科目id")
     @NotNull(message = "会计科目id不能为空")
     private Integer id;
 
+    @ApiModelProperty(name="products",value = "成本项目id列表")
     @NotEmpty(message = "成本项目id不能为空")
     private List<Integer> products;
 }

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

@@ -8,19 +8,21 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("会计科目编辑入参")
 public class AccountingEditDTO {
 
     @NotNull(message = "id不能为空")
-    @ApiModelProperty(name = "",value = "")
+    @ApiModelProperty(name = "id",value = "需要编辑类目的id")
     private Integer id;
 
+    @ApiModelProperty(name = "accountingCode",value = "科目代码")
     @NotEmpty(message = "科目代码不能为空")
     private String accountingCode;
 
+    @ApiModelProperty(name = "accountingName",value = "科目名称")
     @NotEmpty(message = "科目名称不能为空")
     private String accountingName;
 
-//    @NotNull(message = "会计科目类型不能为空")
-//    private Integer accountingType;
+
+
 }

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

@@ -1,26 +1,32 @@
 package com.imed.costaccount.model.dto;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("会计科目保存入参")
 public class AccountingSaveDTO {
 
+    @ApiModelProperty(name = "id",value = "父级id，如果需要新增顶级，那么传0")
     @NotNull(message = "层级id不能为空，顶层传0")
     private Integer id;
 
+    @ApiModelProperty(name = "accountingCode",value = "新增科目代码")
     @NotEmpty(message = "新增科目代码不能为空")
     private String accountingCode;
 
+    @ApiModelProperty(name = "accountingName",value = "新增科目名称")
     @NotEmpty(message = "新增科目名称不能为空")
     private String accountingName;
 
+    @ApiModelProperty(name = "accountingType",value = "会计科目类型1，收入，2.支出")
     @NotNull(message = "会计科目类型不能为空")
     private Integer accountingType;
 
+    @ApiModelProperty(name = "isBaseCode",value = "如果是支出，必须选择收入还是支出")
     private Integer isBaseCode;
 }

src/main/java/com/imed/costaccount/model/ProductDTO.java → src/main/java/com/imed/costaccount/model/dto/ProductDTO.java

@@ -1,4 +1,4 @@
-package com.imed.costaccount.model;
+package com.imed.costaccount.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -6,7 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("成本项目保存对象")
 public class ProductDTO {
 
     @NotNull(message = "成本代码不能为空")

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

@@ -2,21 +2,25 @@ package com.imed.costaccount.model.dto;
 
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("成本项目管理编辑入参对象")
 public class ProductEditDTO {
 
+    @ApiModelProperty(name = "id",value = "成本项目id")
     @NotNull(message = "id不能为空")
     private Integer id;
 
+    @ApiModelProperty(name = "productName",value = "成本名称")
     @NotBlank(message = "成本名称不能为空")
     private String productName;
 
+    @ApiModelProperty(name = "productCode",value = "成本科目代码")
     @NotBlank(message = "成本科目代码不能为空")
     private String productCode;
 

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

@@ -28,7 +28,7 @@ public class ResponsibilityEditDTO {
     private String responsibilityName;
 
     @NotNull(message = "是否汇总中心不能为空")
-    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心（前端校验如果用户责任中心是一级那么必定是汇总中心，反之不是）")
+    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心")
     private Integer isGatherCenter;
 
     @NotNull(message = "收益类型 1. 收费中心，2.成本(费用)中心")

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

@@ -15,7 +15,6 @@ public class ResponsibilitySaveDTO {
     @ApiModelProperty(name = "ApiModelProperty",value = "责任级别id，新增一级不传，如果是添加二级责任中心，那么必传")
     private Integer id;
 
-
     @ApiModelProperty(name = "responsibilityCode",value = "责任中心代码（后台校验唯一性）")
     @NotBlank(message = "责任中心代码不能为空")
     private String responsibilityCode;
@@ -25,7 +24,7 @@ public class ResponsibilitySaveDTO {
     private String responsibilityName;
 
     @NotNull(message = "是否汇总中心不能为空")
-    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心（前端校验如果用户责任中心是一级那么必定是汇总中心，反之不是）")
+    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心")
     private Integer isGatherCenter;
 
     @NotNull(message = "收益类型 1. 收费中心，2.成本(费用)中心")

src/main/java/com/imed/costaccount/model/vo/AccountProductVO.java

@@ -3,28 +3,35 @@ package com.imed.costaccount.model.vo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-@ApiModel
+@ApiModel("会计科目成本项目对照列表返回对象")
 public class AccountProductVO {
 
+    @ApiModelProperty(name = "id",value = "会计科目主键")
     private Integer id;
 
+    @ApiModelProperty(name = "accountingName",value = "会计科目名称")
     private String accountingName;
 
+    @ApiModelProperty(name = "accountingCode",value = "主键")
     private String accountingCode;
 
+    @ApiModelProperty(name = "parentId",value = "主键")
     @JsonIgnore
     private Integer parentId;
 
-    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @ApiModelProperty(name = "productVOs",value = "主键")
     private List<ProductVO> productVOs;
 
+    @ApiModelProperty(name = "isParent",value = "是否是父节点")
     private Boolean isParent=false;
 
+    @ApiModelProperty(name = "child",value = "子对象")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<AccountProductVO> child;
 }

src/main/java/com/imed/costaccount/model/vo/CostResponsibilityVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel(description = "责任中心列表视图对象")
+@ApiModel("责任中心列表视图对象")
 public class CostResponsibilityVO{
 
     @ApiModelProperty(name = "id",value = "主键")

src/main/java/com/imed/costaccount/model/vo/DepartmentVO.java

@@ -1,6 +1,5 @@
 package com.imed.costaccount.model.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -25,6 +24,10 @@ public class DepartmentVO {
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")
     private Integer hospId;
-    @ApiModelProperty(name = "createTime",value = "")
+    @ApiModelProperty(name = "createTime",value = "创建时间时间戳")
     private Long createTime;
+
+    private String hospName;
+
+    private String createDateTime;
 }

src/main/java/com/imed/costaccount/model/vo/ProductVO.java

@@ -1,13 +1,20 @@
 package com.imed.costaccount.model.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("成本项目简单对象")
 public class ProductVO {
+
+    @ApiModelProperty(name = "id",value = "成本项目id")
     private Integer id;
 
+    @ApiModelProperty(name = "productCode",value = "成本项目代码")
     private String productCode;
 
+    @ApiModelProperty(name = "productName",value = "成本项目名称")
     private String productName;
 
 }

src/main/java/com/imed/costaccount/model/vo/SelectAccountingVO.java

@@ -2,6 +2,7 @@ package com.imed.costaccount.model.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.util.List;
@@ -19,5 +20,6 @@ public class SelectAccountingVO {
 
     private String label;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<SelectAccountingVO> children;
 }

src/main/java/com/imed/costaccount/model/vo/test.json

@@ -1,24 +0,0 @@
-[
-  {
-    "id": 1,
-    "responsibilityId": 2,
-    "responsibilityName": "23423",
-    "child": [
-      {
-        "id": 1,
-        "responsibilityId": 3,
-        "responsibilityName": "234223",
-        "departments": [
-          {
-            "departmentId": 1,
-            "departmentName": "234234"
-          },
-          {
-            "departmentId": 1,
-            "departmentName": "234234"
-          }
-        ]
-      }
-    ]
-  }
-]

src/main/java/com/imed/costaccount/service/ProductService.java

@@ -3,7 +3,7 @@ package com.imed.costaccount.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.Product;
-import com.imed.costaccount.model.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;

src/main/java/com/imed/costaccount/service/ResponsibilityService.java

@@ -16,20 +16,22 @@ import java.util.List;
  * 责任中心表
  *
  * @author huangrui
- * @email 
+ * @email
  * @date 2021-07-27 10:41:59
  */
 public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 责任中心列表不分页
+     *
+     * @param user 当前登录人员
      * @return
-     * @param user
      */
     List<CostResponsibilityVO> getList(User user);
 
     /**
      * 新增责任中心
+     *
      * @param responsibilitySaveDTO {@link ResponsibilitySaveDTO }
      * @param user
      */
@@ -37,6 +39,7 @@ public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 编辑责任中心
+     *
      * @param responsibilityEditDTO {@link ResponsibilityEditDTO}
      * @param user
      */
@@ -44,12 +47,14 @@ public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 删除责任中心
+     *
      * @param id
      */
     void deleteCenter(Integer id);
 
     /**
      * 获取部门树列表
+     *
      * @param user
      * @return
      */
@@ -58,7 +63,8 @@ public interface ResponsibilityService extends IService<Responsibility> {
     List<CommonVO> getParentList(User user);
 
     /**
-     * 获取第二级别的责任中心的代码
+     * 获取可不是汇总中心列表
+     *
      * @param hospId
      * @return
      */

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

@@ -63,8 +63,6 @@ public class AccountingProductServiceImpl extends ServiceImpl<AccountingProductM
             List<AccountProductVO> accountTree = this.getAccountTree(parent, all);
             accountVOS.addAll(accountTree);
         }
-        // 第一不让添加
-        accountVOS.forEach(i -> i.setIsParent(true));
         return accountVOS;
     }
 

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

@@ -66,6 +66,8 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
                 .orderByAsc(CostAccountShare::getShareLevel));
         List<CostAccountShare> costAccountShareList = pages.getRecords();
         List<CostAccountShareVO> costAccountShareVOList = BeanUtil.convertList(costAccountShareList, CostAccountShareVO.class);
+        // 设置责任中心的数据 与 会计科目的数据从对应的id里面获取
+
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(costAccountShareVOList);
         return pageUtils;
@@ -83,6 +85,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         Integer hospId = user.getHospId();
         // 检验输入的数据的合理性
         checkAccountShare(costAccountShareSaveDto, hospId);
+
         CostAccountShare costAccountShareRequest = BeanUtil.convertObj(costAccountShareSaveDto, CostAccountShare.class);
         costAccountShareRequest.setHospId(hospId);
         costAccountShareRequest.setCreateTime(System.currentTimeMillis());
@@ -100,21 +103,29 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         if (Objects.isNull(responsibility)){
             throw new CostException(500,"输入的责任不存在");
         }
+        costAccountShareSaveDto.setResponsibilityId(responsibilityId);
+        costAccountShareSaveDto.setResponsibilityCode(responsibility.getResponsibilityCode());
+        costAccountShareSaveDto.setResponsibilityName(responsibility.getResponsibilityName());
+        costAccountShareSaveDto.setShareLevel(responsibility.getShareLevel());
         if (costAccountShareSaveDto.getAccountingId() > 0){
             // 如果输入成本科目的情况下
             Accounting accounting = accountingService.getOne(new QueryWrapper<Accounting>().lambda().eq(Accounting::getHospId, hospId).eq(Accounting::getId, costAccountShareSaveDto.getAccountingId()));
             if (Objects.isNull(accounting)){
                 throw new CostException(500,"输入的成本科目不存在");
+            }else {
+                costAccountShareSaveDto.setAccountingId(accounting.getId());
+                costAccountShareSaveDto.setAccountingName(accounting.getAccountingName());
+                costAccountShareSaveDto.setAccountingCode(accounting.getAccountingCode());
             }
-        }
-        // 检验输入的责任中心与匹配的成本科目是否存在
-        List<CostAccountShare> costAccountShareList = baseMapper.selectList(new QueryWrapper<CostAccountShare>().lambda().eq(CostAccountShare::getHospId,hospId));
-        Map<String, List<CostAccountShare>> costAccountMap = costAccountShareList.stream().collect(Collectors.groupingBy(CostAccountShare::getResponsibilityCode));
-        List<CostAccountShare> list = costAccountMap.get(costAccountShareSaveDto.getResponsibilityCode());
-        if (!CollectionUtils.isEmpty(list)){
-            String accountingCode = list.get(0).getAccountingCode();
-            if (accountingCode.equals(costAccountShareSaveDto.getAccountingCode())){
-                throw new CostException(500,"输入的责任中心对应的成本科目已存在");
+            // 检验输入的责任中心与匹配的成本科目是否存在
+            List<CostAccountShare> costAccountShareList = baseMapper.selectList(new QueryWrapper<CostAccountShare>().lambda().eq(CostAccountShare::getHospId,hospId));
+            Map<String, List<CostAccountShare>> costAccountMap = costAccountShareList.stream().collect(Collectors.groupingBy(CostAccountShare::getResponsibilityCode));
+            List<CostAccountShare> list = costAccountMap.get(costAccountShareSaveDto.getResponsibilityCode());
+            if (!CollectionUtils.isEmpty(list)){
+                String accountingCode = list.get(0).getAccountingCode();
+                if (accountingCode.equals(costAccountShareSaveDto.getAccountingCode())){
+                    throw new CostException(500,"输入的责任中心对应的成本科目已存在");
+                }
             }
         }
         // 检验输入的这个责任中心是否允许输入成本科目
@@ -126,12 +137,11 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
                 throw new CostException(500,"合并计算不允许选择成本科目");
             }
             if (costAccountShareSaveDto.getAccountingId()<= 0 && NumberConstant.ONE.equals(costShareLevel.getCalcType())){
-                throw new CostException(500,"分开计算需要选择成本科目");
+                throw new CostException(500,"分开计算的责任中心需要选择成本科目");
             }
         }else {
             throw new CostException(500,"对不起该责任中心没有对应分摊层级");
         }
-
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.imed.costaccount.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,11 +10,13 @@ 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.Hospital;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +31,8 @@ import java.util.stream.Collectors;
 @Service("departmentService")
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
 
-
+    @Autowired
+    private HospitalServiceImpl hospitalService;
     /**
      * 分页查询科室信息
      *
@@ -46,6 +50,14 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 .like(!StringUtils.isEmpty(name), Department::getDepartmentName, name));
         List<Department> records = pages.getRecords();
         List<DepartmentVO> departmentVOList = BeanUtil.convertList(records, DepartmentVO.class);
+        Hospital hospital = hospitalService.getOne(new QueryWrapper<Hospital>().lambda().eq(Hospital::getId, hospId));
+
+        departmentVOList.forEach(i->{
+            if (Objects.nonNull(hospital)){
+                i.setHospName(hospital.getName());
+            }
+            i.setCreateDateTime(DateUtil.format(DateUtil.date(i.getCreateTime()),"yyyy-MM-dd HH:mm:ss"));
+        });
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(departmentVOList);
         return pageUtils;

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

@@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
-import com.imed.costaccount.model.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.utils.BeanUtil;
-import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

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

@@ -30,8 +30,11 @@ import java.util.stream.Collectors;
 public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper, Responsibility> implements ResponsibilityService {
 
 
-    @Autowired
-    private CostShareLevelServiceImpl costShareLevelService;
+    private final CostShareLevelServiceImpl costShareLevelService;
+
+    public ResponsibilityServiceImpl(CostShareLevelServiceImpl costShareLevelService) {
+        this.costShareLevelService = costShareLevelService;
+    }
 
     /**
      * 责任中心列表不分页
@@ -93,6 +96,10 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         center.setCreateTime(System.currentTimeMillis()).setId(null).setParentId(id).setHospId(user.getHospId()).setResponsibilityLevel(2);
         if (id == 0) {
             center.setResponsibilityLevel(1);
+        }
+
+        // 如果是汇总中心，那么不存在分摊级别
+        if (responsibilitySaveDTO.getIsGatherCenter() == 1) {
             center.setShareLevel(0);
             center.setShareName("");
         }
@@ -276,7 +283,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     }
 
     /**
-     * 获取第二级别的责任中心的数据
+     * 获取可不是汇总中心列表
      *
      * @param hospId
      * @return
@@ -285,7 +292,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     public List<CostResponsibilityLevelVO> getLevelTwo(Integer hospId) {
         List<Responsibility> responsibilities = baseMapper.selectList(new QueryWrapper<Responsibility>().lambda()
                 .eq(Responsibility::getHospId, hospId)
-                .eq(Responsibility::getResponsibilityLevel, NumberConstant.TWO));
+                .eq(Responsibility::getIsGatherCenter,NumberConstant.TWO));
         List<CostResponsibilityLevelVO> costResponsibilityLevelVOS = BeanUtil.convertList(responsibilities, CostResponsibilityLevelVO.class);
         List<CostShareLevelVO> costShareLevelServiceAll = costShareLevelService.getAll(hospId);
         Map<Integer, List<CostShareLevelVO>> listMap = costShareLevelServiceAll.stream().collect(Collectors.groupingBy(CostShareLevelVO::getId));

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

@@ -2,8 +2,7 @@ package com.imed.costaccount.web;
 
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.Product;
-import com.imed.costaccount.model.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;
@@ -11,11 +10,9 @@ import com.imed.costaccount.service.ProductService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.sql.ResultSet;
 import java.util.Arrays;
 import java.util.List;
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 @RequestMapping("/costAccount/responsibility")
 public class ResponsibilityController {
 
-    private ResponsibilityService responsibilityService;
+    private final ResponsibilityService responsibilityService;
 
     public ResponsibilityController(ResponsibilityService responsibilityService) {
         this.responsibilityService = responsibilityService;
@@ -41,7 +41,7 @@ public class ResponsibilityController {
     }
 
     @GetMapping("/getLevelTwo")
-    @ApiOperation("获取第二级的责任中心的数据")
+    @ApiOperation("获取可不是汇总中心列表")
     public Result getLevelTwo(){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();