From ce9b6b8c98df9ecce596aa75e6187f29b54804c4 Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 27 Oct 2025 14:16:10 +0800 Subject: [PATCH 1/3] =?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 --- .../common/core/domain/entity/lis/LabInputmdlDetail.java | 1 + .../java/com/czlis/interfaceCommon/utils/LisWorkUtils.java | 1 + .../src/main/resources/mapper/LabInputmdlDetailMapper.xml | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java index 26294a6..ce2bc8d 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java @@ -13,4 +13,5 @@ public class LabInputmdlDetail { private Integer xh; private String xmdh; private String mrz; + private String xmmc; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index 5ec1a34..2d1271b 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -2132,6 +2132,7 @@ public class LisWorkUtils { labResult.setYbh(ybh); labResult.setXmdh(labInputmdlDetail.getXmdh()); labResult.setCsjg(labInputmdlDetail.getMrz()); + labResult.setXmmc(labInputmdlDetail.getXmmc()); if(!savefalg)labResult.setChangeflag(2); else { labResult.setChangeflag(1); diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlDetailMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlDetailMapper.xml index f0f57a9..8e1c526 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlDetailMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlDetailMapper.xml @@ -3,6 +3,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > + From 7d0e2b20d4859acf011b8c76654d1f20b76ae96f Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 27 Oct 2025 15:38:17 +0800 Subject: [PATCH 2/3] =?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 --- .../main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java | 1 + .../java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index 2d1271b..d02b706 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -173,6 +173,7 @@ public class LisWorkUtils { String yqdl = commonUtil.getYqdl(yq); //查询病人信息 LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); + if(labPat==null) return new Result("0", "保存成功！"); String finish = labPat.getFinish(); if (!"细菌仪".equals(yqdl) && finish != null && finsh == 1) labPat.setFinish("1"); labResultList = saveallresult(labPat, labResultList); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 31e2c71..a059110 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -243,7 +243,7 @@ public class LisWorkServiceImpl implements LisWorkService { labInputcol3.setKj("1"); labInputcol3.setKybj("0"); labInputcol3.setZdts("名称"); - labInputcol3.setMrz("120"); + labInputcol3.setMrz("100"); ResultConfig.add(3,labInputcol3); LabInputcol labInputcol4 =new LabInputcol(); labInputcol4.setXh(4); From 79928cc4a742e796ff09fb9fdf635ca875225187 Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 27 Oct 2025 17:47:11 +0800 Subject: [PATCH 3/3] =?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 --- .../main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index d02b706..06cfd86 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -140,7 +140,7 @@ public class LisWorkUtils { } //commonUtil.delLabResultAll(jyrq0,yq0,ybh0); for (LabResult labResult : labResultList) { - if(labResult.getChangeflag()==2) { + if(labResult.getChangeflag() != null && labResult.getChangeflag()==2) { commonUtil.delLabResult(labResult); commonUtil.insertLabResult(labResult); labResult.setChangeflag(0);