From 50eba4ed4395c92b4554dafe855ce9ece4a890aa Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 18 Sep 2025 17:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/lis/XmDouble.java | 1 + .../core/domain/entity/lis/XmInfoNew.java | 1 + .../core/domain/entity/lis/XmRefNew.java | 32 +++++++++++ .../domain/entity/lis/XmTextresultNew.java | 19 +++++++ .../core/domain/entity/lis/XmValNew.java | 17 ++++++ .../controller/dict/ReportItemController.java | 24 ++++++--- .../controller/dict/XmFeeInstrController.java | 5 ++ .../liswork/mapper/dict/ReportItemMapper.java | 8 ++- .../czlis/liswork/pojo/DTO/XmInfoNewDTO.java | 4 ++ .../liswork/service/ReportItemService.java | 4 +- .../service/impl/ReportItemServiceImpl.java | 53 +++++++++++++++++-- .../resources/mapper/ReportItemMapper.xml | 51 ++++++++++++++++++ 12 files changed, 208 insertions(+), 11 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmRefNew.java create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextresultNew.java create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmValNew.java diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmDouble.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmDouble.java index ebe070a..3f07656 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmDouble.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmDouble.java @@ -29,4 +29,5 @@ public class XmDouble { private String yxgs; private String mrmb; private String mrsjph; + private String yq; } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java index a6e4adc..972d2f0 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java @@ -68,5 +68,6 @@ public class XmInfoNew { private String val3; private String val4; private String val5; + private String isWsw; } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmRefNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmRefNew.java new file mode 100644 index 0000000..bbab8a8 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmRefNew.java @@ -0,0 +1,32 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XmRefNew { + private Integer xmid; + private String xmdh; + private Integer xh; + private String xb; + private BigDecimal nl1; + private BigDecimal nl2; + private String bblx; + private BigDecimal cksx; + private BigDecimal ckxx; + private String dyck; + private String nldw; + private BigDecimal redoxx; + private BigDecimal redosx; + private BigDecimal alterxx; + private BigDecimal altersx; + private String slzq; + private String zd; + private String instrid; + private String yq; +} diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextresultNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextresultNew.java new file mode 100644 index 0000000..ec131d5 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmTextresultNew.java @@ -0,0 +1,19 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XmTextresultNew { + private Integer xmid; + private String xmdh; + private Integer xh; + private String textresult; + private String reserve; + private String yxjs; + private String cjyy; + private String zd; +} diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmValNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmValNew.java new file mode 100644 index 0000000..e6a691a --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmValNew.java @@ -0,0 +1,17 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XmValNew { + private Integer xmid; + private String xmdh; + private String qz; + private String srm; + private Integer xh; + private String jgbz; +} 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 0f8978c..1cd3a75 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 @@ -1,5 +1,6 @@ package com.czlis.liswork.controller.dict; +import com.czlis.common.annotation.Anonymous; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 检验项目维护 + * 检验项目维护(新) */ @Api(tags = "检验项目维护") @RestController @@ -29,13 +30,22 @@ public class ReportItemController extends BaseController { @Autowired private ReportItemService reportItemService; - @ApiOperation("查询检验项目列表") @GetMapping("/query") - public TableDataInfo query(String xmid,String yq,String xmdh){ + @Anonymous + public TableDataInfo query(XmInfoNew xmInfoNew) { startPage(); - List xmInfoNewList = reportItemService.query(xmid,yq,xmdh); - return getDataTable(xmInfoNewList); + List xmInfoNewList = reportItemService.query(xmInfoNew); + return getDataTable(xmInfoNewList); + } + + + @ApiOperation("查询检验项目明细") + @GetMapping("/queryDetail") + @Anonymous + public Result queryDetail(String xmid,String yq,String xmdh){ + XmInfoNewDTO xmInfoNewDTO = reportItemService.queryDetail(xmid,yq,xmdh); + return new Result("0","查询成功！",xmInfoNewDTO); } @Log(title = "检验项目",businessType = BusinessType.INSERT) @@ -99,12 +109,14 @@ public class ReportItemController extends BaseController { return reportItemService.getXmLot(); } + @Log(title = "试剂维护",businessType = BusinessType.INSERT) @ApiOperation("新增试剂维护数据") @PostMapping("/addXmLot") - public Result addXmLot(XmLot xmLot){ + public Result addXmLot(@RequestBody XmLot xmLot){ return reportItemService.addXmLot(xmLot); } + @Log(title = "试剂维护",businessType = BusinessType.DELETE) @ApiOperation("删除试剂维护数据") @GetMapping("/delXmLot") public Result deleteXmLot(String yq,String sjph){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java index c304020..2fcb72f 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java @@ -1,9 +1,11 @@ package com.czlis.liswork.controller.dict; +import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmFeeInstr; +import com.czlis.common.enums.BusinessType; import com.czlis.liswork.service.XmFeeInstrService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,18 +34,21 @@ public class XmFeeInstrController extends BaseController { return getDataTable(xmFeeInstrList); } + @Log(title = "仪器收费项目对照",businessType = BusinessType.INSERT) @ApiOperation("新增仪器收费项目对照") @PostMapping("/add") public Result add(XmFeeInstr xmFeeInstr){ return xmFeeInstrService.add(xmFeeInstr); } + @Log(title = "仪器收费项目对照",businessType = BusinessType.UPDATE) @ApiOperation("修改仪器收费项目对照") @PostMapping("/update") public Result update(XmFeeInstr xmFeeInstr){ return xmFeeInstrService.update(xmFeeInstr); } + @Log(title = "仪器收费项目对照",businessType = BusinessType.DELETE) @ApiOperation("删除仪器收费项目对照") @DeleteMapping("/del") public Result delete(@NotBlank(message = "yq参数不能为空！") String yq,@NotBlank(message = "sfxmdh参数不能为空！") String sfxmdh){ 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 be2f95e..1b0aa9e 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 @@ -6,7 +6,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface ReportItemMapper { - List query(@Param("xmid") String xmid,@Param("yq") String yq,@Param("xmdh") String xmdh); + List query(XmInfoNew xmInfoNew); + List queryXmDouble(XmDouble xmDouble); + List queryXmValNew(XmValNew xmValNew); + List queryXmInter(XmInter xmInter); + List queryXmRefNew(XmRefNew xmRefNew); + List queryXmInfoVs(XmInfoVs xmInfoVs); + List queryXmTextresultNew(XmTextresultNew xmTextresultNew); void addXmInfoNew(XmInfoNew xmInfoNew); void addXmDoubleRow(XmDouble xmDoubleRow); void addXmInterRow(XmInter xmInterRow); diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java index 63295b7..9e84911 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java @@ -17,4 +17,8 @@ public class XmInfoNewDTO { private List xmInterRows; private List xmRefRows; private List xmTextResultRows; + private List xmValNewRows; + private List xmRefNewRows; + private List xmInfoVsRows; + private List xmTextresultNewRows; } 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 d915a46..e8201fe 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -10,7 +10,7 @@ import com.czlis.common.core.domain.entity.lis.XmInfoVs; import java.util.List; public interface ReportItemService { - List query(String xmid,String yq, String xmdh); + XmInfoNewDTO queryDetail(String xmid,String yq, String xmdh); Result add(XmInfoNewDTO xmInfoNewDTO); @@ -34,4 +34,6 @@ public interface ReportItemService { Result addXmLot(XmLot xmLot); Result deleteXmLot(String yq, String sjph); + + List query(XmInfoNew xmInfoNew); } 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 0592e29..c4c00ab 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 @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; import java.util.List; @Service @@ -21,8 +22,42 @@ public class ReportItemServiceImpl implements ReportItemService { private ReportItemMapper reportItemMapper; @Override - public List query(String xmid, String yq, String xmdh) { - return reportItemMapper.query(xmid,yq,xmdh); + public XmInfoNewDTO queryDetail(String xmid, String yq, String xmdh) { + XmInfoNew xmInfoNew = new XmInfoNew(); + xmInfoNew.setXmid(Integer.parseInt(xmid)); + xmInfoNew.setYq(yq); + xmInfoNew.setXmdh(xmdh); + List xmInfoNews = reportItemMapper.query(xmInfoNew); + XmDouble xmDouble = new XmDouble(); + xmDouble.setYq(yq); + xmDouble.setXmdh(xmdh); + List xmDoubles = reportItemMapper.queryXmDouble(xmDouble); + XmValNew xmValNew = new XmValNew(); + xmValNew.setXmid(Integer.parseInt(xmid)); + List xmValNews = reportItemMapper.queryXmValNew(xmValNew); + XmInter xmInter = new XmInter(); + xmInter.setYq(yq); + xmInter.setXmid(Integer.parseInt(xmid)); + List xmInters = reportItemMapper.queryXmInter(xmInter); + XmRefNew xmRefNew = new XmRefNew(); + xmRefNew.setXmid(Integer.parseInt(xmid)); + xmRefNew.setYq(yq); + List xmRefNews = reportItemMapper.queryXmRefNew(xmRefNew); + XmInfoVs xmInfoVs = new XmInfoVs(); + xmInfoVs.setXmid(Integer.parseInt(xmid)); + List xmInfoVss = reportItemMapper.queryXmInfoVs(xmInfoVs); + XmTextresultNew xmTextresultNew = new XmTextresultNew(); + xmTextresultNew.setXmid(Integer.parseInt(xmid)); + List xmTextresultNews = reportItemMapper.queryXmTextresultNew(xmTextresultNew); + XmInfoNewDTO xmInfoNewDTO = new XmInfoNewDTO(); + xmInfoNewDTO.setXmInfoNewRows(xmInfoNews); + xmInfoNewDTO.setXmDoubleRows(xmDoubles); + xmInfoNewDTO.setXmValNewRows(xmValNews); + xmInfoNewDTO.setXmInterRows(xmInters); + xmInfoNewDTO.setXmRefNewRows(xmRefNews); + xmInfoNewDTO.setXmInfoVsRows(xmInfoVss); + xmInfoNewDTO.setXmTextresultNewRows(xmTextresultNews); + return xmInfoNewDTO; } @Transactional(rollbackFor = Exception.class) @@ -72,7 +107,9 @@ public class ReportItemServiceImpl implements ReportItemService { public Result delete(Integer xmid) { Long xmInfoVsCount = reportItemMapper.getXmInfoVsCount(xmid); if(xmInfoVsCount > 0) return new Result("-1","已经有仪器做过这个项目的对照，不允许删除！"); - List xmInfoNewList = reportItemMapper.query(String.valueOf(xmid), null, null); + XmInfoNew xmInfoNew1 = new XmInfoNew(); + xmInfoNew1.setXmid(xmid); + List xmInfoNewList = reportItemMapper.query(xmInfoNew1); for (XmInfoNew xmInfoNew : xmInfoNewList) { String yq = xmInfoNew.getYq(); String xmdh = xmInfoNew.getXmdh(); @@ -170,5 +207,15 @@ public class ReportItemServiceImpl implements ReportItemService { return new Result("0","删除成功！"); } + @Override + public List query(XmInfoNew xmInfoNew) { + if(xmInfoNew != null){ + return reportItemMapper.query(xmInfoNew); + }else{ + return reportItemMapper.query(null); + } + + } + } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index fc7dfd6..2f60eda 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -9,6 +9,57 @@ and xmid = #{xmid} and yq = #{yq} and yq = #{xmdh} + '细菌仪']]> + + + + + + + + + + + + + +