From 7b1dc5b616014a8577593bd4d62fa953111bb4e4 Mon Sep 17 00:00:00 2001 From: tangw Date: Fri, 28 Nov 2025 18:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=94=9F=E7=89=A9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/entity/lis/LabGermsheetNew.java | 2 ++ .../work/LisWorkGermController.java | 8 +++++ .../liswork/mapper/LisWorkGermMapper.java | 4 +++ .../liswork/service/LisWorkGermService.java | 2 +- .../service/impl/LisWorkGermServiceImpl.java | 29 +++++++++++++------ .../resources/mapper/LisWorkGermMapper.xml | 12 ++++++++ 6 files changed, 47 insertions(+), 10 deletions(-) diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java index 66f6bf5..34e4ea7 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabGermsheetNew.java @@ -1,5 +1,6 @@ package com.czlis.common.core.domain.entity.lis; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,6 +12,7 @@ import java.util.Date; public class LabGermsheetNew { private Integer gsid; + @JsonFormat(pattern = "yyyy-MM-dd") private Date jyrq; private String yq; private String ybh; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index e77ca44..eff9751 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.text.Convert; import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.JsonParamUtils; import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.mapper.LisWorkGermMapper; import com.czlis.liswork.mapper.xtwh.XmMedMapper; @@ -172,4 +173,11 @@ public class LisWorkGermController extends BaseController { public Result check(Date jyrq, String yq, String ybh, String yhdh, String jgbz) { return lisWorkGermService.check(jyrq, yq, ybh, yhdh,jgbz); } + + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE) + @ApiOperation("修改样本检验日期") + @GetMapping("/changepatjyrq") + public Result changepatjyrq(Date jyrq, String yq, String ybh) { + return lisWorkGermService.changepatjyrq(jyrq, yq, ybh); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java index a08d4c6..f4d901f 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -26,4 +26,8 @@ public interface LisWorkGermMapper { List> getmedgrouplist(); List getmedgroup(String ywzmc); List getBactMedium(String mediumno); + Date getpatjyrq(@Param("yq") String yq, @Param("ybh")String ybh); + int updatemediumjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); + int changeresultjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); + int changepatjyrq(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh, @Param("jyrq1")Date jyrq1); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java index c108cda..7080d99 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java @@ -17,7 +17,7 @@ public interface LisWorkGermService { Result savemedium(List labGermsheetlist); Result insertmediumnew(LabGermsheetNew labGermsheet); Result updatemediumnew(LabGermsheetNew labGermsheet); - Result deletemediumnew(Long gsid); + Result changepatjyrq(Date jyrq, String yq, String ybh); Result deletemediumlist(Long[] gsids); Result getcomlog(Date jyrq, String yq, String ybh); Result savemedresult(LabResultMed labResultmed); 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 c9350dd..e299ed3 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 @@ -154,7 +154,27 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { private List getmediumgroup(String mediumno){ return lisWorkGermMapper.getBactMediumgroupdet(mediumno); } + @Transactional(rollbackFor = Exception.class) + @Override + public Result changepatjyrq(Date jyrq, String yq, String ybh){ + Date jyrq0 =lisWorkGermMapper.getpatjyrq(yq,ybh); + if(jyrq0==null)return new Result("-1","没发现原样本,忽略修改"); + lisWorkGermMapper.changepatjyrq(jyrq0,yq,ybh,jyrq); + lisWorkGermMapper.changeresultjyrq(jyrq0,yq,ybh,jyrq); + lisWorkGermMapper.updatemediumjyrq(jyrq0,yq,ybh,jyrq); + String yq1= getFirstInstrid(yq); + if(yq1!=null){ + lisWorkGermMapper.changepatjyrq(jyrq0,yq1,ybh,jyrq); + lisWorkGermMapper.changeresultjyrq(jyrq0,yq1,ybh,jyrq); + } + String yq2= getFirstInstrid(yq); + if(yq2!=null){ + lisWorkGermMapper.changepatjyrq(jyrq0,yq2,ybh,jyrq); + lisWorkGermMapper.changeresultjyrq(jyrq0,yq2,ybh,jyrq); + } + return new Result("0","成功"); + } @Override public Result insertmediumnew(LabGermsheetNew labGermsheet){ insertmedium(labGermsheet); @@ -165,10 +185,6 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { lisWorkGermMapper.insertmedium(labGermsheet); } @Transactional(rollbackFor = Exception.class) - public void deletemedium(Long gsid){ - lisWorkGermMapper.deletemedium(gsid); - } - @Transactional(rollbackFor = Exception.class) public void deletemediums(Long[] gsids){ lisWorkGermMapper.deletemediums(gsids); } @@ -177,11 +193,6 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { lisWorkGermMapper.updatemedium(labGermsheet); } @Override - public Result deletemediumnew(Long gsid){ - deletemedium(gsid); - return new Result("0","成功"); - } - @Override public Result deletemediumlist(Long[] gsids){ deletemediums(gsids); return new Result("0","成功"); diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 2f933cb..49b5bad 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -39,6 +39,18 @@ order by yq,jyrq DESC,right(space(20) + ybh,20) DESC + + + update lab_pat set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq} + + + update lab_result set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq} + + + update lab_germsheet_new set jyrq = #{jyrq1} where yq = #{yq} and ybh=#{ybh} and jyrq=#{jyrq} +