jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

批量输入和批量调整修改

Browse Source
This commit is contained in:
jiangs 2026-05-26 14:38:39 +08:00
parent b0d5374034
commit 63929ad397
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchAdjustServiceImpl.java
View File

@ -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.LabPat;
import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResult;
import com.czlis.common.core.domain.entity.lis.XmInfo; 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.CommonUtil;
import com.czlis.interfaceCommon.utils.LisWorkcom; import com.czlis.interfaceCommon.utils.LisWorkcom;
import com.czlis.liswork.mapper.work.BatchAdjustMapper; import com.czlis.liswork.mapper.work.BatchAdjustMapper;
@ -18,7 +17,6 @@ import org.springframework.stereotype.Service;
import javax.script.ScriptEngine; import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager; import javax.script.ScriptEngineManager;
import javax.script.ScriptException; import javax.script.ScriptException;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -33,8 +31,6 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
LisWorkcom lisWorkcom; LisWorkcom lisWorkcom;
@Autowired @Autowired
private CommonUtil commonUtil; private CommonUtil commonUtil;
@Autowired
LabResultMapper labResultMapper;
@Override @Override
public Result readData(BatchAdjustQueryVO batchAdjustQueryVO) { public Result readData(BatchAdjustQueryVO batchAdjustQueryVO) {
@ -95,6 +91,7 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
if(xmInfo != null) xsws = xmInfo.getXsws(); if(xmInfo != null) xsws = xmInfo.getXsws();
//计算之后的值 //计算之后的值
List<LabResult> labResultList = batchAdjustQueryVO.getLabResultList(); List<LabResult> labResultList = batchAdjustQueryVO.getLabResultList();
String err = "";
for (LabResult labResult : labResultList) { for (LabResult labResult : labResultList) {
String csjg = labResult.getCsjg(); String csjg = labResult.getCsjg();
csjg = adjust.replace("R",csjg); csjg = adjust.replace("R",csjg);
@ -113,10 +110,16 @@ public class BatchAdjustServiceImpl implements BatchAdjustService {
labResult.setCsjg(res); labResult.setCsjg(res);
} catch (ScriptException e) { } catch (ScriptException e) {
log.error("表达式计算有误：",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);
}
} }
} }

11
liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.czlis.common.utils.DateUtils;
import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.CommonUtil;
import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.interfaceCommon.utils.LisWorkBase; import com.czlis.interfaceCommon.utils.LisWorkBase;
import com.czlis.interfaceCommon.utils.LisWorkcom;
import com.czlis.liswork.pojo.VO.BatchInVO; import com.czlis.liswork.pojo.VO.BatchInVO;
import com.czlis.liswork.service.BatchInService; import com.czlis.liswork.service.BatchInService;
import com.czlis.liswork.utils.LisCommonUtil; import com.czlis.liswork.utils.LisCommonUtil;
@ -30,7 +31,7 @@ public class BatchInServiceImpl implements BatchInService {
@Autowired @Autowired
CommonUtil commonUtil; CommonUtil commonUtil;
@Autowired @Autowired
LisWorkBase lisWorkBase; LisWorkcom lisWorkcom;
@Resource @Resource
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@ -56,7 +57,7 @@ public class BatchInServiceImpl implements BatchInService {
List<String> resultList = new ArrayList<>(); List<String> resultList = new ArrayList<>();
for (String ybh : ybhList) { for (String ybh : ybhList) {
LabPat labPatOne = commonUtil.getLabPatOne(batchInVO.getJyrq(), batchInVO.getYq(), ybh); 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(); List<LabInputmdlDetail> labInputmdlDetailList = batchInVO.getLabInputmdlDetailList();
for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) { for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) {
LabResult labResult = commonUtil.getLabResult(batchInVO.getJyrq(), yq, ybh, labInputmdlDetail.getXmdh()); LabResult labResult = commonUtil.getLabResult(batchInVO.getJyrq(), yq, ybh, labInputmdlDetail.getXmdh());
@ -75,8 +76,8 @@ public class BatchInServiceImpl implements BatchInService {
//labResult1.setJgbz("M"); //labResult1.setJgbz("M");
applicationContext.getBean(BatchInServiceImpl.class).updateLabResult(labResult1); 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); commonUtil.updateLabPat(labPat);
resultList.add("样本号："+ybh+",添加成功！"); resultList.add("样本号："+ybh+",添加成功！");
//写日志 //写日志
lisWorkBase.setpatLog(batchInVO.getJyrq(), yq, batchInVO.getYbh(), batchInVO.getYhdh()); lisWorkcom.setpatLog(batchInVO.getJyrq(), yq, batchInVO.getYbh(), batchInVO.getYhdh());
} }