Переглянути джерело

添加项目分摊参数计算及项目分摊计算的自定义SQL调用

JammeyJiang 8 місяців тому
батько
коміт
51b707dd93

+ 16 - 0
src/main/java/com/kcim/common/enums/CustomSqlTypeEnum.java

@@ -48,6 +48,22 @@ public enum CustomSqlTypeEnum {
      * 全院损益计算处理
      */
     HOSP_PROFIT_CALC("HOSP_PROFIT_CALC","全院损益计算处理"),
+    /**
+     * 项目分摊参数计算-完全法
+     */
+    FULL_PROJECT_PARAM_CALC("FULL_PROJECT_PARAM_CALC","项目分摊参数计算-完全法"),
+    /**
+     * 项目成本分摊计算-完全法
+     */
+    FULL_PROJECT_COST_CALC("FULL_PROJECT_COST_CALC","项目成本分摊计算-完全法"),
+    /**
+     * 项目分摊参数计算-标准法
+     */
+    STAND_PROJECT_PARAM_CALC("STAND_PROJECT_PARAM_CALC","项目分摊参数计算-标准法"),
+    /**
+     * 项目成本分摊计算-标准法
+     */
+    STAND_PROJECT_COST_CALC("STAND_PROJECT_COST_CALC","项目成本分摊计算-标准法"),
     ;
     private final String code;
     private final String description;

+ 0 - 14
src/main/java/com/kcim/service/impl/CostDepartmentProfitServiceImpl.java

@@ -69,7 +69,6 @@ import java.util.stream.IntStream;
 
 import static com.kcim.common.constants.Constant.PROFIT_REPORT_TYPE;
 import static com.kcim.common.constants.ParameterConstant.MEDICAL_TECHNIQUES_SHARE_LEVEL_ID;
-import static com.kcim.common.constants.ParameterConstant.USER_REPORT_AUTHOR_ABLE;
 
 
 @Service("costDepartmentProfitService")
@@ -1642,19 +1641,6 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
         return responsibilities;
     }
 
-    /**
-     * 判断是否开启用户报表权限功能
-     * @return
-     */
-    public boolean IsUserReportRightAble(){
-        CommonParameterVo parameter = centerService.getParameter(USER_REPORT_AUTHOR_ABLE);
-        if (Objects.isNull(parameter)){
-            return false;
-        }
-        String incomeCollectType = parameter.getValue();
-        return incomeCollectType.equals(NumberConstant.ONE_S);
-    }
-
 
     private void getResponsibilityParent(Responsibility responsibility, Map<Long, Responsibility> collect, List<Responsibility> addList) {
         Responsibility responsibility1 = collect.get(responsibility.getParentId());

+ 7 - 0
src/main/java/com/kcim/service/impl/ProjectCostServiceImpl.java

@@ -412,6 +412,10 @@ public class ProjectCostServiceImpl implements ProjectCostService {
             }
         }
 
+        Map<String,String> sqlParameter = new HashMap<>();
+        sqlParameter.put(SQLParameter.COMPUTE_DATE_CODE,computeDate);
+        sqlService.autoExecuteSql(CustomSqlTypeEnum.FULL_PROJECT_COST_CALC.getCode(),sqlParameter);
+
 //        long count = (itemSize + LIMIT - 1) / LIMIT;        //计算所有项目明细数据
 //        for (int j = 1; j <= count; j++) {
 //            List<PatientItemDepartmentGroupVo> items = importPatientItemRepository.getByDepartGroupComputeDateItem(j,LIMIT,computeDate, currentUser);
@@ -1082,6 +1086,9 @@ public class ProjectCostServiceImpl implements ProjectCostService {
                 }
             }
         }
+        Map<String,String> sqlParameter = new HashMap<>();
+        sqlParameter.put(SQLParameter.COMPUTE_DATE_CODE,computeDate);
+        sqlService.autoExecuteSql(CustomSqlTypeEnum.STAND_PROJECT_COST_CALC.getCode(),sqlParameter);
 
 
 //        //计算所有项目明细数据

+ 12 - 3
src/main/java/com/kcim/service/impl/ShareParamServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kcim.common.constants.Constant;
 import com.kcim.common.constants.NumberConstant;
+import com.kcim.common.constants.SQLParameter;
+import com.kcim.common.enums.CustomSqlTypeEnum;
 import com.kcim.common.exception.CostException;
 import com.kcim.common.util.BeanUtil;
 import com.kcim.common.util.PageUtils;
@@ -13,6 +15,7 @@ import com.kcim.dao.model.dto.PatientItemDepartmentGroupVo;
 import com.kcim.dao.repository.*;
 import com.kcim.service.CenterService;
 import com.kcim.service.ShareParamService;
+import com.kcim.service.SqlService;
 import com.kcim.service.StandItemService;
 import com.kcim.vo.*;
 import com.kcim.web.reponse.ShareParamCostResponse;
@@ -72,8 +75,9 @@ public class ShareParamServiceImpl implements ShareParamService {
     ComputeStandShareParamDetailRepository computeStandShareParamDetailRepository;
 
     StandItemService standItemService;
+    SqlService sqlService;
 
-    public ShareParamServiceImpl(ComputeShareParamRepository repository, ComputeShareParamDetailRepository detailRepository, ImportPatientItemRepository importPatientItemRepository, ItemRepository itemRepository, ItemEmpMapRepository itemEmpMapRepository, ItemEquipmentMapRepository itemEquipmentMapRepository, ItemSpaceMapRepository itemSpaceMapRepository, ShareParamTypeMapRepository shareParamTypeMapRepository, ResponsibilityDepartmentRepository responsibilityDepartmentRepository, CenterService centerService, ComputeStandShareParamRepository computeStandShareParamRepository, ComputeStandShareParamDetailRepository computeStandShareParamDetailRepository, StandItemService standItemService) {
+    public ShareParamServiceImpl(ComputeShareParamRepository repository, ComputeShareParamDetailRepository detailRepository, ImportPatientItemRepository importPatientItemRepository, ItemRepository itemRepository, ItemEmpMapRepository itemEmpMapRepository, ItemEquipmentMapRepository itemEquipmentMapRepository, ItemSpaceMapRepository itemSpaceMapRepository, ShareParamTypeMapRepository shareParamTypeMapRepository, ResponsibilityDepartmentRepository responsibilityDepartmentRepository, CenterService centerService, ComputeStandShareParamRepository computeStandShareParamRepository, ComputeStandShareParamDetailRepository computeStandShareParamDetailRepository, StandItemService standItemService,SqlService sqlService) {
         this.repository = repository;
         this.detailRepository = detailRepository;
         this.importPatientItemRepository = importPatientItemRepository;
@@ -87,6 +91,7 @@ public class ShareParamServiceImpl implements ShareParamService {
         this.computeStandShareParamRepository = computeStandShareParamRepository;
         this.computeStandShareParamDetailRepository = computeStandShareParamDetailRepository;
         this.standItemService = standItemService;
+        this.sqlService=sqlService;
     }
 
     /**
@@ -216,7 +221,9 @@ public class ShareParamServiceImpl implements ShareParamService {
         }
 
 
-
+        Map<String,String> sqlParameter = new HashMap<>();
+        sqlParameter.put(SQLParameter.COMPUTE_DATE_CODE,computeDate);
+        sqlService.autoExecuteSql(CustomSqlTypeEnum.FULL_PROJECT_PARAM_CALC.getCode(),sqlParameter);
 
 
         //
@@ -395,7 +402,9 @@ public class ShareParamServiceImpl implements ShareParamService {
             }
 
         }
-
+        Map<String,String> sqlParameter = new HashMap<>();
+        sqlParameter.put(SQLParameter.COMPUTE_DATE_CODE,computeDate);
+        sqlService.autoExecuteSql(CustomSqlTypeEnum.STAND_PROJECT_PARAM_CALC.getCode(),sqlParameter);
     }
 
     private void checkItemCount(String computeDate, SessionUserVO currentUser) {