|
@@ -1,7 +1,6 @@
|
|
|
package com.imed.costaccount.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
-import cn.hutool.core.util.ReUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -15,7 +14,6 @@ import com.imed.costaccount.model.User;
|
|
|
import com.imed.costaccount.model.dto.CopyReportDTO;
|
|
|
import com.imed.costaccount.model.dto.ReportFormEditDTO;
|
|
|
import com.imed.costaccount.model.dto.ReportFormSaveDTO;
|
|
|
-import com.imed.costaccount.model.vo.RelationVO;
|
|
|
import com.imed.costaccount.model.vo.ReportFormVO;
|
|
|
import com.imed.costaccount.service.ReportFormService;
|
|
|
import com.imed.costaccount.service.ReportRelationService;
|
|
@@ -159,6 +157,9 @@ public class ReportFormServiceImpl extends ServiceImpl<ReportFormMapper, ReportF
|
|
|
*/
|
|
|
private void checkCalcFormula(String calcFormula, Long hospId, Integer reportType) {
|
|
|
// 校验公式不存在单独的'[' 或 ']',中括号未闭合
|
|
|
+ if (StrUtil.isBlank(calcFormula)){
|
|
|
+ throw new CostException("计算公式未传递");
|
|
|
+ }
|
|
|
boolean flag = CommonUtil.whetherStringClose(calcFormula);
|
|
|
if (!flag) {
|
|
|
throw new CostException("计算公式错误,英文中括号未正确闭合");
|