diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchAdjustServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchAdjustServiceImpl.java
index 891d55a..f3767ba 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchAdjustServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchAdjustServiceImpl.java
@@ -5,7 +5,6 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.common.core.domain.entity.lis.XmInfo;
-import com.czlis.interfaceCommon.mapper.LabResultMapper;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.LisWorkcom;
 import com.czlis.liswork.mapper.work.BatchAdjustMapper;
@@ -18,7 +17,6 @@ import org.springframework.stereotype.Service;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +31,6 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
     LisWorkcom lisWorkcom;
     @Autowired
     private CommonUtil commonUtil;
-    @Autowired
-    LabResultMapper labResultMapper;
 
     @Override
     public Result readData(BatchAdjustQueryVO batchAdjustQueryVO) {
@@ -95,6 +91,7 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
         if(xmInfo != null) xsws = xmInfo.getXsws();
         //计算之后的值
         List<LabResult> labResultList = batchAdjustQueryVO.getLabResultList();
+        String err = "";
         for (LabResult labResult : labResultList) {
             String csjg = labResult.getCsjg();
             csjg = adjust.replace("R",csjg);
@@ -113,10 +110,16 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
                 labResult.setCsjg(res);
             } catch (ScriptException e) {
                 log.error("表达式计算有误：",e);
-                return new Result("-1","表达式计算有误！"+e.getMessage());
+                err = err + "," + csjg;
+
             }
 
         }
-        return new Result("0","计算成功！",labResultList);
+        if(!err.equals("")){
+            return new Result("-1","部分结果计算失败，可能是表达式错误:"+err,labResultList);
+        }else{
+            return new Result("0","计算成功！",labResultList);
+        }
+
     }
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java
index ac6e795..af6fde2 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java
@@ -9,6 +9,7 @@ import com.czlis.common.utils.DateUtils;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.LisUtil;
 import com.czlis.interfaceCommon.utils.LisWorkBase;
+import com.czlis.interfaceCommon.utils.LisWorkcom;
 import com.czlis.liswork.pojo.VO.BatchInVO;
 import com.czlis.liswork.service.BatchInService;
 import com.czlis.liswork.utils.LisCommonUtil;
@@ -30,7 +31,7 @@ public class BatchInServiceImpl implements BatchInService {
     @Autowired
     CommonUtil commonUtil;
     @Autowired
-    LisWorkBase lisWorkBase;
+    LisWorkcom lisWorkcom;
     @Resource
     private ApplicationContext applicationContext;
 
@@ -56,7 +57,7 @@ public class BatchInServiceImpl implements BatchInService {
         List<String> resultList = new ArrayList<>();
         for (String ybh : ybhList) {
             LabPat labPatOne = commonUtil.getLabPatOne(batchInVO.getJyrq(), batchInVO.getYq(), ybh);
-            if(!lisWorkBase.canmodifysample(labPatOne)) return new Result("-1","样本号："+ybh+",没有修改权限！");
+            if(!lisWorkcom.canmodifysample(labPatOne)) return new Result("-1","样本号："+ybh+",没有修改权限！");
             List<LabInputmdlDetail> labInputmdlDetailList = batchInVO.getLabInputmdlDetailList();
             for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) {
                 LabResult labResult = commonUtil.getLabResult(batchInVO.getJyrq(), yq, ybh, labInputmdlDetail.getXmdh());
@@ -75,8 +76,8 @@ public class BatchInServiceImpl implements BatchInService {
                 //labResult1.setJgbz("M");
                 applicationContext.getBean(BatchInServiceImpl.class).updateLabResult(labResult1);
 
-
-                //TODO 增加计算项目
+                //增加计算项目
+                lisWorkcom.calcsample(batchInVO.getJyrq(), yq, ybh);
 
             }
 
@@ -92,7 +93,7 @@ public class BatchInServiceImpl implements BatchInService {
             commonUtil.updateLabPat(labPat);
             resultList.add("样本号："+ybh+",添加成功！");
             //写日志
-            lisWorkBase.setpatLog(batchInVO.getJyrq(), yq, batchInVO.getYbh(), batchInVO.getYhdh());
+            lisWorkcom.setpatLog(batchInVO.getJyrq(), yq, batchInVO.getYbh(), batchInVO.getYhdh());
         }