diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java index 43eb1c9..17b59c5 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface LabResultMapper { List getLabResultList(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh") String ybh); - List getLabResult(@Param("jyrq") Date jyrq, @Param("yq") String yq,@Param("ybh") String ybh,@Param("xmdh") String xmdh); + LabResult getLabResult(@Param("jyrq") Date jyrq, @Param("yq") String yq,@Param("ybh") String ybh,@Param("xmdh") String xmdh); int insertLabResult(LabResult labResult); int delLabResult(LabResult labResult); int updateLabResult(LabResult labResult); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index be5b0d9..437a9dd 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -52,10 +52,10 @@ public class CommonUtil { //申请单明细表集合 //====检验结果表操作方法集合=== - public List getLabResult(Date jyrq, String yq, String ybh, String xmdh) {return labResultMapper.getLabResult(jyrq, yq, ybh,xmdh);} + public LabResult getLabResult(Date jyrq, String yq, String ybh, String xmdh) {return labResultMapper.getLabResult(jyrq, yq, ybh,xmdh);} public List getLabResultList(Date jyrq, String yq, String ybh) {return labResultMapper.getLabResultList(jyrq, yq, ybh);} @Transactional(rollbackFor = Exception.class) - public int insertLabResult(LabResult labResult) {return labResultMapper.updateLabResult(labResult);} + public int insertLabResult(LabResult labResult) {return labResultMapper.insertLabResult(labResult);} public List getresultinfo(Date jyrq, String yq, String ybh) {return labResultMapper.getLabResultList(jyrq, yq, ybh);} @Transactional(rollbackFor = Exception.class) public int delLabResult(LabResult labResult) {return labResultMapper.delLabResult(labResult);} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java b/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java index e0c0e65..cace485 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java @@ -9,7 +9,7 @@ import java.util.List; public interface LabResultService { List getLabResultList(Date jyrq, String yq, String ybh); Result getresultinfo(Date jyrq, String yq, String ybh); - List getLabResult(Date jyrq, String yq, String ybh,String xmdh); + LabResult getLabResult(Date jyrq, String yq, String ybh,String xmdh); Result insertLabResult(LabResult labResult); Result delLabResult(LabResult labResult); Result updateLabResult(LabResult labResult); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java index c11bbba..2d6511f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java @@ -18,7 +18,7 @@ public class LabResultImpl implements LabResultService { @Autowired private LabResultMapper labResultMapper; @Override - public List getLabResult(Date jyrq, String yq, String ybh,String xmdh) { + public LabResult getLabResult(Date jyrq, String yq, String ybh,String xmdh) { return labResultMapper.getLabResult(jyrq, yq, ybh,xmdh); } @Override diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 5f770c1..8be1bff 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -345,6 +345,19 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { String result=CalcUtils.getValueFromCalc(jsgs,variables); if (result != null && !result.trim().isEmpty()) { //插入结果值 + LabResult labResult=commonUtil.getLabResult(jyrq,yq,ybh,xmdh); + if(labResult==null){ + labResult=new LabResult(); + labResult.setJyrq(jyrq); + labResult.setYq(yq); + labResult.setYbh(ybh); + labResult.setXmdh(xmdh); + labResult.setCsjg(result); + commonUtil.insertLabResult(labResult); + }else{ + labResult.setCsjg(result); + commonUtil.updateLabResult(labResult); + } } } }