Ver Fonte

科室损益计算

ljx há 4 anos atrás
pai
commit
ef90d8efc2

+ 2 - 2
src/main/java/com/imed/costaccount/model/dto/ResponsibilityEditDTO.java

@@ -36,8 +36,8 @@ public class ResponsibilityEditDTO {
     private Integer responsibilityType;
 
     @NotNull(message = "分摊级别id不能为空")
-    @ApiModelProperty(name = "shareLevelId",value = "分摊级别id")
-    private Long shareLevelId;
+    @ApiModelProperty(name = "shareId",value = "分摊级别id")
+    private Long shareId;
 
     @NotNull(message = "分摊级别不能为空")
     @ApiModelProperty(name = "shareLevel",value = "分摊级别(分摊接口中获取,暂时可写死)")

+ 2 - 3
src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.enums.ErrorCodeEnum;
 import com.imed.costaccount.mapper.ResponsibilityMapper;
@@ -15,7 +15,6 @@ import com.imed.costaccount.model.dto.ResponsibilityEditDTO;
 import com.imed.costaccount.model.dto.ResponsibilitySaveDTO;
 import com.imed.costaccount.model.vo.*;
 import com.imed.costaccount.service.ResponsibilityService;
-import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -249,7 +248,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.checkCode(dto.getResponsibilityCode(), hospId);
         // 新增父节点数据
         Responsibility newResponsibility = BeanUtil.convertObj(dto, Responsibility.class);
-        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(new Date().getTime());
+        newResponsibility.setId(null).setHospId(responsibility.getHospId()).setCreateTime(System.currentTimeMillis());
 
         // 如果是汇总中心,那么不存在分摊级别
         Integer isGatherCenter = newResponsibility.getIsGatherCenter();