From 309b0003a5b626dbca89d259acc8947df38f3a95 Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 8 Jul 2026 18:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaceCommon/utils/LisWorkBase.java | 4 ++-- .../impl/work/BatchAdjustServiceImpl.java | 1 - .../service/impl/work/BatchInServiceImpl.java | 23 +++++++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java index 0b26745..50404e4 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java @@ -363,9 +363,9 @@ public class LisWorkBase { } } } - String yhdh = SecurityUtils.getLoginUser().getUsername(); + String yhdh = getusername(); if (labPat.getYhdh() == null || labPat.getYhdh().isEmpty()) - labPat.setYhdh(SecurityUtils.getLoginUser().getUsername()); + labPat.setYhdh(yhdh); labPat.setLastuser(yhdh); labPat.setLastdt(ldt_now); Integer shcs = labPat.getShcs(); 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 f3767ba..df3c04e 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 @@ -72,7 +72,6 @@ public class BatchAdjustServiceImpl implements BatchAdjustService { labPat.setYq(yq); labPat.setYbh(ybh); labPat.setLastuser(userId); - labPat.setJgbz("1"); labPat.setLastdt(commonUtil.getCurrentTime()); commonUtil.updateLabPat(labPat); } 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 b066cc5..68be7d3 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 @@ -53,7 +53,17 @@ public class BatchInServiceImpl implements BatchInService { List ybhList = (List) result.getData(); List resultList = new ArrayList<>(); for (String ybh : ybhList) { + boolean newPat=false; LabPat labPatOne = commonUtil.getLabPatOne(batchInVO.getJyrq(), batchInVO.getYq(), ybh); + if(labPatOne==null){ + newPat=true; + labPatOne.setJyrq(batchInVO.getJyrq()); + labPatOne.setYbh(ybh); + labPatOne.setYq(batchInVO.getYq()); + labPatOne.setJgbz("0"); + labPatOne.setYhdh(batchInVO.getYhdh()); + } + if(!lisWorkcom.canmodifysample(labPatOne)) return new Result("-1","样本号："+ybh+",没有修改权限！"); List labInputmdlDetailList = batchInVO.getLabInputmdlDetailList(); for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) { @@ -73,9 +83,6 @@ public class BatchInServiceImpl implements BatchInService { //labResult1.setJgbz("M"); applicationContext.getBean(BatchInServiceImpl.class).updateLabResult(labResult1); - //增加计算项目 - lisWorkcom.calcsample(batchInVO.getJyrq(), yq, ybh); - } //更新标本上传标志和操作员 @@ -83,12 +90,18 @@ public class BatchInServiceImpl implements BatchInService { labPat.setLastuser(batchInVO.getYhdh()); labPat.setLastdt(commonUtil.getCurrentTime()); labPat.setJgbz("0"); - labPat.setYblx(batchInVO.getYblx()); + if(!"".equals(batchInVO.getYblx())&&batchInVO.getYblx()!=null)labPat.setYblx(batchInVO.getYblx()); labPat.setJyrq(batchInVO.getJyrq()); labPat.setYq(yq); labPat.setYbh(ybh); - commonUtil.updateLabPat(labPat); + if(newPat){ + commonUtil.insertLabPat(labPat); + }else{ + commonUtil.updateLabPat(labPat); + } resultList.add("样本号："+ybh+",添加成功！"); + //增加计算项目 + lisWorkcom.calcsample(batchInVO.getJyrq(), yq, ybh); //写日志 lisWorkcom.setpatLog(batchInVO.getJyrq(), yq, batchInVO.getYbh(), batchInVO.getYhdh()); }