From 943fa0bc4e047a8562b5170fb36bbbe891e20f19 Mon Sep 17 00:00:00 2001 From: tangw Date: Tue, 18 Nov 2025 17:50:48 +0800 Subject: [PATCH 1/3] =?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 --- .../common/core/domain/entity/lis/LabPat.java | 1 + .../interfaceCommon/mapper/LabPatMapper.java | 3 - .../interfaceCommon/utils/CommonUtil.java | 9 --- .../main/resources/mapper/LabPatMapper.xml | 20 +---- .../liswork/mapper/LisWorkGermMapper.java | 8 +- .../czlis/liswork/mapper/LisWorkMapper.java | 2 + .../czlis/liswork/service/LabPatService.java | 21 ----- .../liswork/service/LisWorkGermService.java | 3 + .../service/impl/LabPatServiceImpl.java | 77 ------------------- .../service/impl/LisWorkGermServiceImpl.java | 11 ++- .../service/impl/LisWorkServiceImpl.java | 6 +- .../resources/mapper/LisWorkGermMapper.xml | 21 ++++- .../main/resources/mapper/LisWorkMapper.xml | 12 +++ 13 files changed, 54 insertions(+), 140 deletions(-) delete mode 100644 liswork/src/main/java/com/czlis/liswork/service/LabPatService.java delete mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPat.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPat.java index c090cfd..91e3f06 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPat.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabPat.java @@ -80,4 +80,5 @@ public class LabPat extends BaseEntity { private Date faultdt; private String sn_tss; private String sn_result; + private String cp_pyzq; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java index 8abff02..d88c758 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java @@ -11,9 +11,6 @@ public interface LabPatMapper { List getLabPatListBySqh(String sqh); LabPat getLabPatOne(@Param("jyrq") Date jyrq, @Param("yq")String yq,@Param("ybh") String ybh); void insertLabPat(LabPat labPat); - List getSampleList(@Param("jyrq") Date jyrq, @Param("yq") String yq); - List getSampleListday(@Param("yq") String yq,@Param("days")Long days); - List getLabPat(LabPat labPat); String getLabPatJgbz(@Param("jyrq")Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); int delLabPat(@Param("jyrq") Date jyrq, @Param("yq") String yq,@Param("ybh") String ybh); int updateLabPat(LabPat labPat); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index 45417b8..3bd310a 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -100,15 +100,6 @@ public class CommonUtil { return labPatMapper.getLabPatListBySqh(sqh); } - public List getLabPatList(LabPat labPat) { - return labPatMapper.getLabPat(labPat); - } - public List getsamplelist(Date jyrq, String yq){ - return labPatMapper.getSampleList(jyrq,yq); - } - public List getSampleListday(String yq, Long days){ - return labPatMapper.getSampleListday(yq,days); - } public LabPatfee getLabPatfee(Date jyrq, String yq, String ybh) { return labPatfeeMapper.getLabPatfee(jyrq,yq,ybh); } diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml index aa8079e..438a2c2 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -9,25 +9,7 @@ - - select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg,alarmflag,finish,fslx,autojgbz,lstd,shcs,yblx,sqh,yhdh,ch,zjf from lab_pat - - - + 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 a6cd0cd..cada59f 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java @@ -1,15 +1,14 @@ package com.czlis.liswork.mapper; -import com.czlis.common.core.domain.entity.lis.BactMediumgroupdet; -import com.czlis.common.core.domain.entity.lis.LabGermsheetNew; -import com.czlis.common.core.domain.entity.lis.LabResultMed; -import com.czlis.common.core.domain.entity.lis.XmMedDetail; +import com.czlis.common.core.domain.entity.lis.*; import com.czlis.liswork.pojo.DTO.MediumDTO; import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; public interface LisWorkGermMapper { + List getSampleListday(@Param("yq") String yq, @Param("days")Integer days); + List getSampleListWSW(@Param("jyrq") Date jyrq, @Param("yq") String yq); List getLabResultMedInfo(LabResultMed labResultMed); List getmedium(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh); String getmediumno(@Param("sqh") String sqh,@Param("yblx") String yblx); @@ -19,4 +18,5 @@ public interface LisWorkGermMapper { 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/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 21495fe..54811b6 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -17,4 +17,6 @@ public interface LisWorkMapper { List getXmInter(XmInter xmInter); int inserXmInter(XmInter xmInter); int updateXmInter(XmInter xmInter); + List getSampleList(@Param("jyrq") Date jyrq, @Param("yq") String yq); + } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java b/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java deleted file mode 100644 index c7522f3..0000000 --- a/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.czlis.liswork.service; - -import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.LabPat; - -import java.util.Date; -import java.util.List; - -public interface LabPatService { - List getLabPatList(LabPat labPat); - List getSampleList(Date jyrq, String yq, Long days); - Result getLabPat(Date jyrq, String yq,String ybh); - Result insertLabPat(LabPat labPat); - Result delLabPat(LabPat labPat); - Result updateLabPat(LabPat labPat); - //根据主键判断是否存在数据 - int getCountById(Date jyrq, String yq,String ybh) ; - //根据编号查sqh - String getSqhById(Date jyrq,String yq,String ybh); - -} 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 8c3bd96..40f41e5 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.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResultMed; @@ -17,4 +18,6 @@ public interface LisWorkGermService { Result savemedresultall(List labResultmedlist); Result deletemedresult(LabResultMed labResultmed); Result sampleMedInfo(Date jyrq, String yq, String ybh); + List getSampleList(Date jyrq, String yq, Integer days); + } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java deleted file mode 100644 index 038c178..0000000 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.czlis.liswork.service.impl; - -import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.LabPat; -import com.czlis.liswork.service.LabPatService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.czlis.interfaceCommon.mapper.LabPatMapper; -import java.util.Date; -import java.util.List; - -@Service -@Slf4j -public class LabPatServiceImpl implements LabPatService { - @Autowired - private LabPatMapper labPatMapper; - @Override - public List getLabPatList(LabPat labPat) { - return labPatMapper.getLabPat(labPat); - } - @Override - public List getSampleList(Date jyrq, String yq, Long days) { - if(days>1) { - return labPatMapper.getSampleListday(yq, days); - }else { - return labPatMapper.getSampleList(jyrq, yq); - } - } - @Override - public Result getLabPat(Date jyrq, String yq,String ybh) { - LabPat labPatlist=labPatMapper.getLabPatOne(jyrq,yq,ybh); - return new Result("0", "获取该样本数据成功！",labPatlist); - } - @Transactional(rollbackFor = Exception.class) - @Override - public Result insertLabPat(LabPat labPat) { - int row = labPatMapper.updateLabPat(labPat); - if (row > 0) - return new Result("0", "修改成功！"); - else - return new Result("-1", "修改失败！"); - } - @Transactional(rollbackFor = Exception.class) - @Override - public Result delLabPat(LabPat labPat){ - int row = labPatMapper.updateLabPat(labPat); - if (row > 0) - return new Result("0", "修改成功！"); - else - return new Result("-1", "修改失败！"); - } - @Transactional(rollbackFor = Exception.class) - @Override - public Result updateLabPat(LabPat labPat){ - int row = labPatMapper.updateLabPat(labPat); - if (row > 0) - return new Result("0", "修改成功！"); - else - return new Result("-1", "修改失败！"); - } - //根据主键判断是否存在数据 - @Transactional(rollbackFor = Exception.class) - @Override - public int getCountById(Date jyrq, String yq,String ybh) { - return labPatMapper.getCountByKey(jyrq,yq,ybh); - } - //根据编号查sqh - @Transactional(rollbackFor = Exception.class) - @Override - public String getSqhById(Date jyrq,String yq,String ybh){ - return labPatMapper.getSqhByKey(jyrq,yq,ybh); - } - - -} 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 5e0d189..9659c74 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 @@ -9,6 +9,7 @@ import com.czlis.interfaceCommon.mapper.LabResultMedMapper; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.liswork.mapper.LisWorkGermMapper; +import com.czlis.liswork.mapper.LisWorkMapper; import com.czlis.liswork.mapper.xtwh.XmMedgroupMapper; import com.czlis.liswork.pojo.DTO.MediumDTO; import com.czlis.liswork.pojo.HistoryResult; @@ -74,7 +75,15 @@ public class LisWorkGermServiceImpl implements LisWorkGermService { map.put("yq2",yq2); return new Result("0","成功",map); } - + @Override + public List getSampleList(Date jyrq, String yq, Integer days) { + if(days==-1) return lisWorkGermMapper.getSampleListday(yq, 0); + if (days > 1) { + return lisWorkGermMapper.getSampleListday(yq, days);//new Result("0", "获取样本数据成功！", labPatListday); + } else { + return lisWorkGermMapper.getSampleListWSW(jyrq, yq);//new Result("0", "获取样本数据成功！", labPatListday); + } + } /** * 获取培养基记录 * @param jyrq diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 7c68a09..3d1c3bd 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -461,11 +461,7 @@ public class LisWorkServiceImpl implements LisWorkService { @Override public List getSampleList(Date jyrq, String yq, Long days) { - if (days > 1) { - return commonUtil.getSampleListday(yq, days);//new Result("0", "获取样本数据成功！", labPatListday); - } else { - return commonUtil.getsamplelist(jyrq, yq);//new Result("0", "获取样本数据成功！", labPatListday); - } + return lisWorkMapper.getSampleList(jyrq, yq);//new Result("0", "获取样本数据成功！", labPatListday); } @Override diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 29adb5f..df0f601 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -2,6 +2,10 @@ + + select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg,alarmflag,finish,fslx,autojgbz,lstd,shcs,yblx,sqh,yhdh,ch,zjf,CONVERT(varchar(10), DATEDIFF(day, CONVERT(varchar(10),sqsj,110), CONVERT(varchar(10),isnull(dysj,getdate()),110)))+'天' as cp_pyzq from lab_pat + + - + + + + + and yq = #{yq} + and jyrq = #{jyrq} + + order by yq,jyrq,right(space(20) + ybh,20) + select instrid,jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg,alarmflag,finish,fslx,autojgbz,lstd,shcs,yblx,sqh,yhdh,ch,zjf from lab_pat From 0ffa0b4152cc82dc79f596016dfd8e3294fd34db Mon Sep 17 00:00:00 2001 From: tangw Date: Tue, 18 Nov 2025 17:54:56 +0800 Subject: [PATCH 2/3] =?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 --- .../controller/work/LisWorkController.java | 2 +- .../controller/work/LisWorkGermController.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index f6e362d..0fb8d47 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -62,7 +62,7 @@ public class LisWorkController extends BaseController { return new Result("0", "获取样本数据成功！", lisWorkService.getSampleList(jyrq, yq, days)); } - @ApiOperation("获取样本列表") + @ApiOperation("获取样本列表分页") @GetMapping("/samplelistpage") public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) { try { 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 3ac9c47..0e57b21 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 @@ -71,5 +71,23 @@ public class LisWorkGermController extends BaseController { public Result getmedgroup(String mbmc){ return lisWorkGermService.getmedgroup(mbmc); } + @ApiOperation("获取微生物样本列表") + @GetMapping("/wswsamplelist") + public Result wswgetSampleList(Date jyrq, String yq, Integer days) { + return new Result("0", "获取样本数据成功！", lisWorkGermService.getSampleList(jyrq, yq, days)); + } + + @ApiOperation("获取微生物样本列表分页") + @GetMapping("/wswsamplelistpage") + public TableDataInfo wswsamplelistpage(Date jyrq, String yq, Integer days) { + try { + startPage(); + startOrderBy(); + List labPatList = lisWorkGermService.getSampleList(jyrq, yq, days); + return getDataTable(labPatList); + } finally { + clearPage(); + } + } } From cce33a511110d0691017fa8b94debe3fd57d5cb5 Mon Sep 17 00:00:00 2001 From: tangw Date: Tue, 18 Nov 2025 17:56:21 +0800 Subject: [PATCH 3/3] =?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 --- .../czlis/liswork/controller/work/LisWorkGermController.java | 2 -- 1 file changed, 2 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 0e57b21..cbeabef 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 @@ -6,9 +6,7 @@ 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.page.TableDataInfo; -import com.czlis.liswork.service.LabResultService; import com.czlis.liswork.service.LisWorkGermService; -import com.czlis.liswork.service.LisWorkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j;