From 4c69895746ff42ab53f629c0b13b39eb01c32f12 Mon Sep 17 00:00:00 2001 From: tangw Date: Fri, 28 Nov 2025 12:20:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E7=94=9F=E7=89=A9=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/LisWorkGermController.java | 33 ++++++++++++-- .../liswork/mapper/LisWorkGermMapper.java | 3 ++ .../liswork/service/LisWorkGermService.java | 6 +++ .../service/impl/LisWorkGermServiceImpl.java | 45 +++++++++++++++++++ .../resources/mapper/LisWorkGermMapper.xml | 41 +++++++++++++++-- 5 files changed, 121 insertions(+), 7 deletions(-) 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 ff773e8..e77ca44 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 @@ -3,11 +3,9 @@ package com.czlis.liswork.controller.work; 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.domain.entity.lis.LabPat; -import com.czlis.common.core.domain.entity.lis.LabResult; -import com.czlis.common.core.domain.entity.lis.LabResultMed; -import com.czlis.common.core.domain.entity.lis.XmMed; +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.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.mapper.LisWorkGermMapper; @@ -109,6 +107,33 @@ public class LisWorkGermController extends BaseController { public Result getmedium(Date jyrq, String yq, String ybh){ return lisWorkGermService.getmedium(jyrq, yq, ybh); } + @ApiOperation("新增培养基") + @PostMapping("/insertmedium") + public Result insertmedium(@RequestBody LabGermsheetNew labGermsheet){ + return lisWorkGermService.insertmediumnew(labGermsheet); + } + @ApiOperation("修改培养基") + @PostMapping("/updatemedium") + public Result updatemedium(@RequestBody LabGermsheetNew labGermsheet){ + return lisWorkGermService.updatemediumnew(labGermsheet); + } + @ApiOperation("保存培养基") + @PostMapping("/savemedium") + public Result savemedium(@RequestBody List labGermsheetlist){ + return lisWorkGermService.savemedium(labGermsheetlist); + } + @ApiOperation("删除培养基") + @DeleteMapping("/deletemedium/{gsids}") + public Result deletemedium(@PathVariable String gsids){ + Long[] userIdArray = Convert.toLongArray(gsids); + return lisWorkGermService.deletemediumlist(userIdArray); + } + @ApiOperation("删除培养基#") + @DeleteMapping("/deletemedium") + public Result deletemediums(@RequestBody List gsid){ + Long[] userIdArray = gsid.toArray(new Long[0]); + return lisWorkGermService.deletemediumlist(userIdArray); + } @ApiOperation("获取操作记录") @GetMapping("/getcomlog") public Result getcomlog(Date jyrq, String yq, String 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 e92ff8d..a08d4c6 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -17,6 +17,9 @@ public interface LisWorkGermMapper { String getmediumnox(String yblx); List getBactMediumgroupdet(String mediumno); int insertmedium(LabGermsheetNew labGermsheetNew); + int deletemedium(Long gsid); + int deletemediums(Long[] gsids); + int updatemedium(LabGermsheetNew labGermsheetNew); List getXmMedDetailNew(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh); List getXmMedDetail(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh); String getXmMedDetailBZ(@Param("yq") String yq,@Param("xmdh") String xmdh); 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 38a3e58..c108cda 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java @@ -1,6 +1,7 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabGermsheetNew; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResultMed; @@ -13,6 +14,11 @@ public interface LisWorkGermService { Result getresultinfo(Date jyrq, String yq, String ybh); Result getInstrid(String yq); Result getmedium(Date jyrq, String yq, String ybh); + Result savemedium(List labGermsheetlist); + Result insertmediumnew(LabGermsheetNew labGermsheet); + Result updatemediumnew(LabGermsheetNew labGermsheet); + Result deletemediumnew(Long gsid); + Result deletemediumlist(Long[] gsids); Result getcomlog(Date jyrq, String yq, String ybh); Result savemedresult(LabResultMed labResultmed); Result savemedresultall(List labResultmedlist); 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 08c32cb..c9350dd 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,10 +154,55 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { private List getmediumgroup(String mediumno){ return lisWorkGermMapper.getBactMediumgroupdet(mediumno); } + + @Override + public Result insertmediumnew(LabGermsheetNew labGermsheet){ + insertmedium(labGermsheet); + return new Result("0","成功"); + } @Transactional(rollbackFor = Exception.class) public void insertmedium(LabGermsheetNew labGermsheet){ 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); + } + @Transactional(rollbackFor = Exception.class) + public void updatemedium(LabGermsheetNew labGermsheet){ + 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","成功"); + } + @Override + public Result updatemediumnew(LabGermsheetNew labGermsheet){ + updatemedium(labGermsheet); + return new Result("0","成功"); + } + @Override + public Result savemedium(List labGermsheetlist){ + for(LabGermsheetNew labGermsheet : labGermsheetlist) { + Integer gsid=labGermsheet.getGsid(); + if(gsid!=null){ + updatemedium(labGermsheet); + }else{ + insertmedium(labGermsheet); + } + } + return new Result("0","成功"); + } /**初级报告仪器ID**/ private String getFirstInstrid(String yq){ if(yq==null)return null; diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 23f8e04..2f933cb 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -46,7 +46,8 @@ - insert into lab_germsheet_new (jyrq, yq, ybh,mediumno,sheetdate,sheetuser,medium) - values (#{jyrq},#{yq},#{ybh},#{mediumno},#{sheetdate},#{sheetuser},#{medium}) + insert into lab_germsheet_new (jyrq, yq, + ybh, mediumno, sheetdate, + sheetuser, medium, condtions, + smear, dyeing, colonyresult, + colonynum, otherresult) + values (#{jyrq}, #{yq}, + #{ybh}, #{mediumno}, #{sheetdate}, + #{sheetuser}, #{medium}, #{condtions}, + #{smear}, #{dyeing}, #{colonyresult}, + #{colonynum}, #{otherresult}) + + update lab_germsheet_new + set jyrq = #{jyrq}, + yq = #{yq}, + ybh = #{ybh}, + mediumno = #{mediumno}, + sheetdate = #{sheetdate}, + sheetuser = #{sheetuser}, + medium = #{medium}, + condtions = #{condtions}, + smear = #{smear}, + dyeing = #{dyeing}, + colonyresult = #{colonyresult}, + colonynum = #{colonynum}, + otherresult = #{otherresult} + where gsid = #{gsid} + + + delete from lab_germsheet_new where gsid = #{gsid} + + + DELETE FROM lab_germsheet_new WHERE gsid IN + + #{gsid} + +