From f7d6f62b174127e340fe7f207e4f9906e4184942 Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 29 Oct 2025 11:40:37 +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 --- .../core/domain/entity/lis/LabResultRe.java | 2 ++ .../work/LisWorkPageInfoController.java | 11 +++++++++- .../liswork/mapper/LisWorkPageInfoMapper.java | 2 ++ .../service/LisWorkPageInfoService.java | 2 ++ .../impl/LisWorkPageInfoServiceImpl.java | 18 ++++++++++++---- .../mapper/LisWorkPageInfoMapper.xml | 21 ++++++++++++++++++- 6 files changed, 50 insertions(+), 6 deletions(-) diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultRe.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultRe.java index fed15f5..0db9ebf 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultRe.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultRe.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; @NoArgsConstructor public class LabResultRe { private String wyh; + @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/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 3cc1156..43b4ea1 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -45,7 +45,11 @@ public class LisWorkPageInfoController extends BaseController { return lisWorkPageInfoService.saveRedo(labResultRe); } - + @ApiOperation("删除复查结果") + @PostMapping("/deleteRedo") + public Result deleteRedo(@RequestBody LabResultRe labResultRe) { + return lisWorkPageInfoService.deleteRedo(labResultRe); + } @Anonymous @ApiOperation("获取历史结果") @GetMapping("/history") @@ -89,6 +93,11 @@ public class LisWorkPageInfoController extends BaseController { public Result getInputmdl(String yq) { return lisWorkPageInfoService.getInputmdl(yq); } + @ApiOperation("获取临床意义") + @GetMapping("/clinicref") + public Result getclinicref(String yq, String xmdh) { + return lisWorkPageInfoService.getclinicref(yq,xmdh); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java index 866266f..f027adf 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java @@ -27,5 +27,7 @@ public interface LisWorkPageInfoMapper { List getInputmdl(String yq); int insertLabResultRe(LabResultRe labResultRe); int updateLabResultRe(LabResultRe labResultRe); + int deleteRedo(LabResultRe labResultRe); + String getclinicref(@Param("yq") String yq,@Param("xmdh") String xmdh); LabResultRe getLabResultRe(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh,@Param("xmdh") String xmdh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java index 1d48a6e..549243a 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -10,6 +10,7 @@ public interface LisWorkPageInfoService { Result getRedo(Date jyrq, String yq, String ybh); Result swapRedo(LabResultRe labResultRe); Result saveRedo(LabResultRe labResultRe); + Result deleteRedo(LabResultRe labResultRe); Result getHistory(Date jyrq, String yq, String ybh); Result getReqdetail(Date jyrq, String yq, String ybh); Result getOtherinstr(Date jyrq, String yq, String ybh); @@ -20,4 +21,5 @@ public interface LisWorkPageInfoService { Result getReqdetailMX(String yq, String sqxmdh); Result getInputmdl(String yq); + Result getclinicref(String yq, String xmdh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 51f27b7..064a7ec 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -97,13 +97,18 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { String xmdh=labResultRe.getXmdh(); LabResultRe labResultRe0 =lisWorkPageInfoMapper.getLabResultRe(jyrq,yq,ybh,xmdh); if(labResultRe0==null){ - lisWorkPageInfoMapper.updateLabResultRe(labResultRe); - }else{ lisWorkPageInfoMapper.insertLabResultRe(labResultRe); + }else{ + lisWorkPageInfoMapper.updateLabResultRe(labResultRe); } - return new Result("0","交换数据成功！",labResultRe); + return new Result("0","保存成功！",labResultRe); } - +@Override +@Transactional(rollbackFor = Exception.class) +public Result deleteRedo(LabResultRe labResultRe){ + lisWorkPageInfoMapper.deleteRedo(labResultRe); + return new Result("0","成功！"); +} @Override public Result getHistory(Date jyrq, String yq, String ybh) { Map map = new HashMap<>(); @@ -263,5 +268,10 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("0","获取成功！",historyResultDTO); } + @Override + public Result getclinicref(String yq, String xmdh) { + String lcyy=lisWorkPageInfoMapper.getclinicref(yq,xmdh); + return new Result("0","获取成功！",lcyy); + } } diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index b561d47..0784b89 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -44,6 +44,23 @@ + + delete from lab_result_re + + + and jyrq = #{jyrq} + + + and yq = #{yq} + + + and ybh = #{ybh} + + + and xmdh = #{xmdh} + + + insert into lab_result_re (jyrq, yq, ybh,xmdh,csjg) values (#{jyrq},#{yq},#{ybh},#{xmdh},#{csjg}) @@ -174,5 +191,7 @@ FROM lab_inputmdl WHERE ( lab_inputmdl.yq = #{yq} ) - +