diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java index dc17c8d..20645a7 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java @@ -25,4 +25,5 @@ public class XmInfoVs { private String cksx; private String ckxx; private String dyckz; + private String xmmc; } 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 4eaa2c5..5747c65 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 @@ -195,6 +195,16 @@ public class ReportItemController extends BaseController { return reportItemService.delXmRefNew(xmRefNew); } + @ApiOperation("查询检验项目排序") + @GetMapping("/getitemsort") + public Result getitemsort(String yq){ + return reportItemService.queryXmInfoVsDYXH(yq); + } + @ApiOperation("保存检验项目排序") + @PostMapping("/saveitemsort") + public Result saveitemsort(@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 fdb72a2..edd2b54 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 @@ -14,6 +14,7 @@ public interface ReportItemMapper { List queryXmInter(XmInter xmInter); List queryXmRefNew(XmRefNew xmRefNew); List queryXmInfoVs(XmInfoVs xmInfoVs); + List queryXmInfoVsDYXH(String yq); List queryXmTextresultNew(XmTextresultNew xmTextresultNew); void addXmInfoNew(XmInfoNew xmInfoNew); void addXmDoubleRow(XmDouble xmDoubleRow); @@ -39,7 +40,7 @@ public interface ReportItemMapper { void updateXmTextResultRow(XmTextresultNew xmTextResultRow); void updateXminfoVs(XmInfoVs xmInfoVs); void updateXmFilter(XmFilter xmFilter); - + void updateXminfoVsDYXH(@Param("list") List list); void addXmInfoVs(XmInfoVs xmInfoVs); void deleteXmInfoVs(Integer vsid); 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 ef25e5b..ed9a156 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -55,4 +55,7 @@ public interface ReportItemService { Result delXmRefNew(XmRefNew xmRefNew); Result getSjcs(String yq); + Result queryXmInfoVsDYXH(String yq); + + Result updateXminfoVsDYXH(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 892463f..b40f3f2 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 @@ -419,6 +419,14 @@ public class ReportItemServiceImpl implements ReportItemService { List> sjcsList = reportItemMapper.getSjcs(yq); return new Result("0","获取数据成功!",sjcsList); } - - + @Override + public Result queryXmInfoVsDYXH(String yq) { + return new Result("0","成功!",reportItemMapper.queryXmInfoVsDYXH(yq)); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result updateXminfoVsDYXH(List list) { + reportItemMapper.updateXminfoVsDYXH(list); + return new Result("0","成功!"); + } } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index 34bc68b..22bcd30 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -61,7 +61,10 @@ and yq = #{yq} - +