diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 5747c65..6ed54f6 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java @@ -205,6 +205,16 @@ public class ReportItemController extends BaseController { public Result saveitemsort(@RequestBody List XmInfoVsList){ return reportItemService.updateXminfoVsDYXH(XmInfoVsList); } + @ApiOperation("查询检验项目通道号") + @GetMapping("/getitemtdh") + public Result getitemtdh(String yq){ + return reportItemService.queryXmInfoVsDYXH(yq); + } + @ApiOperation("保存检验项目通道号") + @PostMapping("/saveitemtdh") + public Result saveitemtdh(@RequestBody List XmInfoVsList){ + return reportItemService.updateXminfoVsDYXH(XmInfoVsList); + } @ApiOperation("获取试剂厂家") @GetMapping("/querySjcs") diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java index edd2b54..eb3fe0b 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java @@ -12,6 +12,7 @@ public interface ReportItemMapper { List queryXmDouble(XmDouble xmDouble); List queryXmValNew(XmValNew xmValNew); List queryXmInter(XmInter xmInter); + XmInter getXmInter(@Param("yq") String yq,@Param("tdh") String tdh); List queryXmRefNew(XmRefNew xmRefNew); List queryXmInfoVs(XmInfoVs xmInfoVs); List queryXmInfoVsDYXH(String yq); diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java index ed9a156..9a563c5 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -58,4 +58,6 @@ public interface ReportItemService { Result queryXmInfoVsDYXH(String yq); Result updateXminfoVsDYXH(List list); + Result getitemtdh(String yq); + Result saveitemtdh(List list); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java index b40f3f2..4c1db91 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; @Service @Slf4j @@ -429,4 +430,27 @@ public class ReportItemServiceImpl implements ReportItemService { reportItemMapper.updateXminfoVsDYXH(list); return new Result("0","成功!"); } + @Override + public Result getitemtdh(String yq){ + XmInter xmInter=new XmInter(); + xmInter.setYq(yq); + return new Result("0","成功!",reportItemMapper.queryXmInter(xmInter)); + + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result saveitemtdh(List list){ + List list0=list.stream().filter(st->st.getYq()!=null&&st.getTdh()!=null&&!"".equals(st.getYq())&&!"".equals(st.getTdh())).collect(Collectors.toList()); + for(XmInter xmInter:list0){ + String yq=xmInter.getYq(); + String tdh=xmInter.getTdh(); + XmInter xmInter0 =reportItemMapper.getXmInter(yq,tdh); + if(xmInter0==null){ + reportItemMapper.addXmInterRow(xmInter); + }else{ + reportItemMapper.updateXmInterRow(xmInter); + } + } + return new Result("0","成功!"); + } } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index 22bcd30..cd6a5a5 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -40,10 +40,18 @@ select * from xm_inter and yq = #{yq} + and tdh = #{tdh} and xmdh = #{xmdh} and xmid = #{xmid} +