添加参数控制是否开启全院通用项目的项目成本计算功能

src/main/java/com/kcim/common/constants/ParameterConstant.java

@@ -37,5 +37,10 @@ public interface ParameterConstant {
      */
     Long USER_REPORT_AUTHOR_ABLE = 1862419414851391488L;
 
+    /**
+     * 项目成本计算是否启用全院通用项目计算功能
+     */
+    Long USER_HOSP_ITEM_CALC=1889925898824716288L;
+
 
 }

src/main/java/com/kcim/service/impl/CenterServiceImpl.java

@@ -14,6 +14,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -99,7 +100,7 @@ public class CenterServiceImpl implements CenterService {
         try {
             Object dict = endPoint.getParameter(LOCAL_SYSTEM_ID, parameterCode);
             CommonParameterVo commonParameterVo = JSON.parseObject(JSON.toJSONString(dict), CommonParameterVo.class);
-            if(ObjectUtils.isEmpty(commonParameterVo)||ObjectUtils.isEmpty(commonParameterVo.getValue())) {
+            if(ObjectUtils.isEmpty(commonParameterVo)|| StringUtils.isEmpty(commonParameterVo.getValue())) {
                 return Constant.EMPTY_STR;
             }
             return  commonParameterVo.getValue();

src/main/java/com/kcim/service/impl/ProjectCostServiceImpl.java

@@ -257,8 +257,13 @@ public class ProjectCostServiceImpl implements ProjectCostService {
      */
     @Override
     public void computeItemCost(String computeDate){
-        //项目成本分摊计算
-        calcItemCostAllocation(computeDate);
+        //根据参数判断是否走新的计算流程
+        if(NumberConstant.ONE_S.equals(centerService.getParameterValue(ParameterConstant.USER_HOSP_ITEM_CALC))){
+            //项目成本分摊计算
+            calcItemCostAllocation(computeDate);
+        }else{
+            computeItemCostACtion(computeDate);
+        }
         log.info("项目成本分摊计算完成开始执行后续处理脚本");
         //执行后续处理脚本
         execItemCostSQL(computeDate);

src/main/java/com/kcim/service/impl/ShareParamServiceImpl.java

@@ -4,6 +4,7 @@ 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.ParameterConstant;
 import com.kcim.common.constants.SQLParameter;
 import com.kcim.common.enums.CustomSqlTypeEnum;
 import com.kcim.common.exception.CostException;
@@ -149,8 +150,13 @@ public class ShareParamServiceImpl implements ShareParamService {
      */
     @Override
     public void computeShareParamCost(String computeDate){
-        //完全法项目分摊参数计算
-        calcShareParamCost(computeDate);
+        //根据参数判断是否走新的计算流程
+        if(NumberConstant.ONE_S.equals(centerService.getParameterValue(ParameterConstant.USER_HOSP_ITEM_CALC))){
+            //完全法项目分摊参数计算
+            calcShareParamCost(computeDate);
+        }else{
+            computeShareParamCostAction(computeDate);
+        }
         //执行完全法项目分摊参数计算后续处理脚本
         execShareParamCostSQL(computeDate);
     }