From 71e7c264e2c81a63f19bab5e169af0acdff74ce7 Mon Sep 17 00:00:00 2001 From: tangw Date: Fri, 31 Oct 2025 16:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/LabResultMedMapper.java | 10 ++-- .../interfaceCommon/utils/CommonUtil.java | 29 ++++++--- .../interfaceCommon/utils/ReportUtil.java | 2 +- .../resources/mapper/LabResultMedMapper.xml | 60 +++++++++++++++---- .../service/impl/LisWorkGermServiceImpl.java | 25 +++++++- 5 files changed, 99 insertions(+), 27 deletions(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMedMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMedMapper.java index bbb7917..a8150e6 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMedMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMedMapper.java @@ -1,16 +1,14 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.lis.LabResultMed; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface LabResultMedMapper { - List getLabResultMed(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh, @Param("xmdh")String xmdh); - int getLabResultMedCount(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh); - int delLabResultMed(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("xmdh")String xmdh); - int delLabResultMedAll(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh); + List getLabResultMed(LabResultMed labResultMed); + int getLabResultMedCount(LabResultMed labResultMed); + int delLabResultMed(LabResultMed labResultMed); int insertLabResultMed(LabResultMed labResultMed); int insertLabResultMedAll(List labResultMedList); + int updateLabResultMed(LabResultMed labResultMed); } 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 20a08a1..935a7c6 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 @@ -328,19 +328,30 @@ public class CommonUtil { public LabPatlog getLabPatlog(Date jyrq, String yq, String ybh,Date xgrq) { return labPatlogMapper.getLabPatlog(jyrq, yq, ybh,xgrq); } - public int getLabResultMedCount(Date jyrq, String yq, String ybh) { - return labResultMedMapper.getLabResultMedCount(jyrq, yq, ybh); + public int getLabResultMedCount(LabResultMed labResultMed) { + return labResultMedMapper.getLabResultMedCount(labResultMed); } - public List getLabResultMed(Date jyrq, String yq, String ybh,String xmdh){ - return labResultMedMapper.getLabResultMed(jyrq, yq, ybh,xmdh); + public int getLabResultMedCountAll(Date jyrq, String yq, String ybh) { + LabResultMed labResultMed=new LabResultMed(); + labResultMed.setJyrq(jyrq); + labResultMed.setYq(yq); + labResultMed.setYbh(ybh); + return labResultMedMapper.getLabResultMedCount(labResultMed); + } + public List getLabResultMed(LabResultMed labResultMed){ + return labResultMedMapper.getLabResultMed(labResultMed); } @Transactional(rollbackFor = Exception.class) - public void delLabResultMed(Date jyrq, String yq, String ybh,String xmdh) { - labResultMedMapper.delLabResultMed(jyrq, yq, ybh,xmdh); + public void delLabResultMed(LabResultMed labResultMed) { + labResultMedMapper.delLabResultMed( labResultMed); } @Transactional(rollbackFor = Exception.class) public void delLabResultMedAll(Date jyrq, String yq, String ybh) { - labResultMedMapper.delLabResultMedAll(jyrq, yq, ybh); + LabResultMed labResultMed=new LabResultMed(); + labResultMed.setJyrq(jyrq); + labResultMed.setYq(yq); + labResultMed.setYbh(ybh); + labResultMedMapper.delLabResultMed( labResultMed); } @Transactional(rollbackFor = Exception.class) public int insertLabResultMed(LabResultMed labResultMed){ @@ -350,6 +361,10 @@ public class CommonUtil { public int insertLabResultMedAll(List labResultMedList){ return labResultMedMapper.insertLabResultMedAll(labResultMedList); } + @Transactional(rollbackFor = Exception.class) + public int updateLabResultMed(LabResultMed labResultMed){ + return labResultMedMapper.updateLabResultMed(labResultMed); + } //封箱 public List getLabReqpack(String packno){ return labReqpackMapper.getLabReqpack(packno); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java index e08450e..ff9ff3c 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java @@ -194,7 +194,7 @@ public class ReportUtil { //判断细菌仪使用的报告单模板 String yqdl = commonUtil.getYqdl(yq); if ("细菌仪".equals(yqdl)) { - int ym = commonUtil.getLabResultMedCount(jyrq, yq, ybh); + int ym = commonUtil.getLabResultMedCountAll(jyrq, yq, ybh); if (ym > 1) { if ("2".equals(NOBOTH)) { return "A4"; diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml index fa06b17..19dcdc3 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultMedMapper.xml @@ -18,8 +18,12 @@ and xmdh = #{xmdh} + + and ywdh = #{ywdh} + + delete from lab_resultmed - where jyrq = #{jyrq} - and yq = #{yq} - and ybh = #{ybh} - and xmdh = #{xmdh} - - - delete from lab_resultmed - where jyrq = #{jyrq} - and yq = #{yq} - and ybh = #{ybh} + + + and jyrq = #{jyrq} + + + and yq = #{yq} + + + and ybh = #{ybh} + + + and xmdh = #{xmdh} + + + and ywdh = #{ywdh} + + insert into lab_resultmed (jyrq, yq, ybh, @@ -69,6 +86,27 @@ ) AS temp - + + update lab_resultmed + set xh=#{xh},ywdh=#{ywdh}, mic=#{mic},rad=#{rad}, csjg=#{csjg}, + jgbz=#{jgbz},bz=#{bz},txtresult=#{txtresult} + + + and jyrq = #{jyrq} + + + and yq = #{yq} + + + and ybh = #{ybh} + + + and xmdh = #{xmdh} + + + and ywdh = #{ywdh} + + + \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java index dc514c1..a331cec 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java @@ -156,7 +156,22 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { } @Override public Result savemedresult(LabResultMed labResultmed) { - commonUtil.insertLabResultMed(labResultmed); + Date jyrq=labResultmed.getJyrq(); + if(jyrq==null)return new Result("-1","检验日期不允许为空"); + String yq=labResultmed.getYq(); + if(yq==null||"".equals(yq))return new Result("-1","仪器不允许为空"); + String ybh=labResultmed.getYbh(); + if(ybh==null||"".equals(ybh))return new Result("-1","样本号不允许为空"); + String xmdh=labResultmed.getXmdh(); + if(xmdh==null||"".equals(xmdh))return new Result("-1","细菌代码不允许为空"); + String ywdh=labResultmed.getYwdh(); + if(ywdh==null||"".equals(ywdh))return new Result("-1","药物代码不允许为空"); + int sl=commonUtil.getLabResultMedCount(labResultmed); + if(sl==0) { + commonUtil.insertLabResultMed(labResultmed); + }else{ + commonUtil.updateLabResultMed(labResultmed); + } return new Result("0","成功"); } @Override @@ -167,10 +182,16 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { @Override public Result deletemedresult(LabResultMed labResultmed) { Date jyrq=labResultmed.getJyrq(); + if(jyrq==null)return new Result("-1","检验日期不允许为空"); String yq=labResultmed.getYq(); + if(yq==null||"".equals(yq))return new Result("-1","仪器不允许为空"); String ybh=labResultmed.getYbh(); + if(ybh==null||"".equals(ybh))return new Result("-1","样本号不允许为空"); String xmdh=labResultmed.getXmdh(); - commonUtil.delLabResultMed(jyrq,yq,ybh,xmdh); + if(xmdh==null||"".equals(xmdh))return new Result("-1","细菌代码不允许为空"); + String ywdh=labResultmed.getYwdh(); + if(ywdh==null||"".equals(ywdh))return new Result("-1","药物代码不允许为空"); + commonUtil.delLabResultMed(labResultmed); return new Result("0","成功"); } }