From 8a838af8b6a90eee07b0a250a0e6f33edbdf4482 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 24 Oct 2025 11:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BB=AA=E5=99=A8=E7=BB=93=E6=9E=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/LabInputmdlMapper.java | 16 +- .../resources/mapper/LabInputmdlMapper.xml | 72 ++++++++- .../work/LisWorkPageInfoController.java | 5 +- .../mapper/xtwh/LabInputmdlMapper.java | 22 --- .../service/LisWorkPageInfoService.java | 2 +- .../impl/LisWorkPageInfoServiceImpl.java | 141 ++++++++++-------- .../impl/xtwh/LabInputmdlServiceImpl.java | 2 +- .../resources/mapper/LabInputmdlMapper.xml | 72 --------- .../mapper/LisWorkPageInfoMapper.xml | 5 +- 9 files changed, 169 insertions(+), 168 deletions(-) delete mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LabInputmdlMapper.java delete mode 100644 liswork/src/main/resources/mapper/LabInputmdlMapper.xml diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java index 6455596..d0983ee 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java @@ -1,13 +1,27 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.lis.LabInputmdl; +import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; import org.apache.ibatis.annotations.Param; import java.util.List; public interface LabInputmdlMapper { + List query(LabInputmdl labInputmdl); + + List queryDetail(LabInputmdl labInputmdl); + + void add(LabInputmdl labInputmdl); + + void addDetail(LabInputmdlDetail labInputmdlDetail); + + void update(LabInputmdl labInputmdl); + void updateDetail(LabInputmdlDetail labInputmdlDetail); + void delete(LabInputmdl labInputmdl); + void deleteDetail(LabInputmdlDetail labInputmdlDetail); + List getLabInputmdl(String yq); - LabInputmdl getLabInputmdlmbmc(@Param("yq") String yq,@Param("mbmc") String mbmc); + LabInputmdl getLabInputmdlmbmc(@Param("yq") String yq, @Param("mbmc") String mbmc); List getLabInputmdlzdsr(String yq); List getLabInputmdlzdsrybh(@Param("yq") String yq,@Param("ybh") String ybh); } diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml index a42e69f..8f6dd88 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml @@ -2,6 +2,72 @@ + + + + + + + insert into lab_inputmdl( + yq,mbmc,srbh,zdsr,qsybh,jsybh,yblx + )values( + #{yq},#{mbmc},#{srbh},#{zdsr},#{qsybh},#{jsybh},#{yblx} + ) + + + + insert into lab_inputmdldetail( + yq,mbmc,xh,xmdh,mrz + )values( + #{yq},#{mbmc},#{xh},#{xmdh},#{mrz} + ) + + + + update lab_inputmdl + + mbmc = #{mbmc}, + srbh = #{srbh}, + zdsr = #{zdsr}, + qsybh = #{qsybh}, + jsybh = #{jsybh}, + yblx = #{yblx}, + yq = #{yq},mbmc = #{mbmc} + + where yq = #{yq},mbmc = #{mbmc} + + + + update lab_inputmdldetail + + xmdh = #{xmdh}, + mrz = #{mrz}, + yq = #{yq},mbmc = #{mbmc},xh=#{xh} + + where yq = #{yq},mbmc = #{mbmc},xh=#{xh} + + + + delete from lab_inputmdl where yq = #{yq} and mbmc = #{mbmc} + + + + delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc} and xh = #{xh} + + @@ -10,11 +76,11 @@ + + - - diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 0fa7b55..61c5d8f 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -46,10 +46,11 @@ public class LisWorkPageInfoController extends BaseController { return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh); } + @Anonymous @ApiOperation("获取其他仪器结果明细") @GetMapping("/otherinstrdetail") - public Result getOtherinstrDetail(String brdh,String yq,Date jyrq){ - return lisWorkPageInfoService.getOtherinstrDetail(brdh,yq,jyrq); + public Result getOtherinstrDetail(String brdh,String yq,Date jyrq,String ybh){ + return lisWorkPageInfoService.getOtherinstrDetail(brdh,yq,jyrq,ybh); } @ApiOperation("获取收费信息") diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LabInputmdlMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LabInputmdlMapper.java deleted file mode 100644 index 548a2c6..0000000 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LabInputmdlMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.czlis.liswork.mapper.xtwh; - -import com.czlis.common.core.domain.entity.lis.LabInputmdl; -import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; -import com.czlis.liswork.pojo.DTO.LabInputmdlDTO; - -import java.util.List; - -public interface LabInputmdlMapper { - List query(LabInputmdl labInputmdl); - - List queryDetail(LabInputmdl labInputmdl); - - void add(LabInputmdl labInputmdl); - - void addDetail(LabInputmdlDetail labInputmdlDetail); - - void update(LabInputmdl labInputmdl); - void updateDetail(LabInputmdlDetail labInputmdlDetail); - void delete(LabInputmdl labInputmdl); - void deleteDetail(LabInputmdlDetail labInputmdlDetail); -} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java index a0512f1..383efbc 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -12,7 +12,7 @@ public interface LisWorkPageInfoService { Result getOtherinstr(Date jyrq, String yq, String ybh); Result getReqInfo(Date jyrq, String yq, String ybh); - Result getOtherinstrDetail(String brdh, String yq, Date jyrq); + Result getOtherinstrDetail(String brdh, String yq, Date jyrq,String ybh); Result getReqdetailMX(String yq, String sqxmdh); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 2f9d5a9..fbbdc32 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -78,12 +78,84 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { map.clear(); map.put("yqdl", hisResultThisList.get(0).getYqdl()); map.put("brdh",hisResultThisList.get(0).getBrdh()); + Result historyResult = getHistoryResult(hisResultThisList, map); + return new Result("0","获取成功！",historyResult.getData()); + } + + /** + * 获取收费信息 + * @param jyrq + * @param yq + * @param ybh + * @return + */ + @Override + public Result getReqdetail(Date jyrq, String yq, String ybh) { + LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); + if(labPatOne == null) return new Result("-1","没有查到对应的上机记录！"); + String sqh = labPatOne.getSqh(); + List> labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh); + return new Result("0","获取数据成功！",labReqdetailList); + } + + @Override + public Result getOtherinstr(Date jyrq, String yq, String ybh) { + //String value = commonUtil.getComOptValue(yq, "COMPAREDA"); + //先固定一个30天 + String value = "30"; + DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value)); + LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); + String brdh = labPatOne.getBrdh(); + String brxm = labPatOne.getBrxm(); + List> queryList = lisWorkPageInfoMapper.getOtherinstr(jyrq,dayEnd,brdh,brxm); + return new Result("0","查询数据成功！",queryList); + } + + @Override + public Result getReqInfo(Date jyrq, String yq, String ybh) { + List> reqInfoList = lisWorkPageInfoMapper.getReqInfo(jyrq,yq,ybh); + return new Result("0","获取标本流转数据成功！",reqInfoList); + } + + @Override + public Result getOtherinstrDetail(String brdh, String yq, Date jyrq,String ybh) { + //List> otherinstrDetailList = lisWorkPageInfoMapper.getOtherinstrDetail(brdh,yq,jyrq); + Map map = new HashMap<>(); + map.put("jyrq",jyrq); + map.put("yq",yq); + map.put("ybh",ybh); + //本次结果 + List hisResultThisList = lisWorkPageInfoMapper.getHisResult(map); + if(hisResultThisList.size()<=0) return new Result("-1","没有找到对应的结果信息！"); + map.clear(); + map.put("yqdl", hisResultThisList.get(0).getYqdl()); + map.put("brdh",hisResultThisList.get(0).getBrdh()); + Result historyResult = getHistoryResult(hisResultThisList, map); + return new Result("0","获取成功！",historyResult.getData()); + } + + /** + * 申请项目明细 + * @param yq + * @param sqxmdh + * @return + */ + @Override + public Result getReqdetailMX(String yq, String sqxmdh) { + List> bgxmList = lisWorkPageInfoMapper.getbgxm(yq, sqxmdh); + return new Result("0","获取数据成功！",bgxmList); + } + + @Override + public Result getInputmdl(String yq) { + List labInputmdlList = lisWorkPageInfoMapper.getInputmdl(yq); + return new Result("0","获取数据成功！",labInputmdlList); + } + + + public Result getHistoryResult(List hisResultThisList,Map map){ List hisResultList = lisWorkPageInfoMapper.getHisResult(map); -// for (HistoryResult historyResult : hisResultThisList) { -// List collect = hisResultList.stream().filter(historyResult1 -> -// historyResult1.getXmdh().equals(historyResult.getXmdh()) && !historyResult1.getJyrq().equals(historyResult.getJyrq())).collect(Collectors.toList()); -// if(!collect.isEmpty()) hisResultThisList.addAll(collect); -// } + //排序,先按时间排序，再按项目代号排序 hisResultList.sort(new Comparator() { @Override @@ -151,64 +223,5 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("0","获取成功！",historyResultDTO); } - /** - * 获取收费信息 - * @param jyrq - * @param yq - * @param ybh - * @return - */ - @Override - public Result getReqdetail(Date jyrq, String yq, String ybh) { - LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); - if(labPatOne == null) return new Result("-1","没有查到对应的上机记录！"); - String sqh = labPatOne.getSqh(); - List> labReqdetailList = lisWorkPageInfoMapper.getReqdetail(sqh); - return new Result("0","获取数据成功！",labReqdetailList); - } - - @Override - public Result getOtherinstr(Date jyrq, String yq, String ybh) { - //String value = commonUtil.getComOptValue(yq, "COMPAREDA"); - //先固定一个30天 - String value = "30"; - DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value)); - LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); - String brdh = labPatOne.getBrdh(); - String brxm = labPatOne.getBrxm(); - List> queryList = lisWorkPageInfoMapper.getOtherinstr(jyrq,dayEnd,brdh,brxm); - return new Result("0","查询数据成功！",queryList); - } - - @Override - public Result getReqInfo(Date jyrq, String yq, String ybh) { - List> reqInfoList = lisWorkPageInfoMapper.getReqInfo(jyrq,yq,ybh); - return new Result("0","获取标本流转数据成功！",reqInfoList); - } - - @Override - public Result getOtherinstrDetail(String brdh, String yq, Date jyrq) { - List> otherinstrDetailList = lisWorkPageInfoMapper.getOtherinstrDetail(brdh,yq,jyrq); - return new Result("0","查询成功！",otherinstrDetailList); - } - - /** - * 申请项目明细 - * @param yq - * @param sqxmdh - * @return - */ - @Override - public Result getReqdetailMX(String yq, String sqxmdh) { - List> bgxmList = lisWorkPageInfoMapper.getbgxm(yq, sqxmdh); - return new Result("0","获取数据成功！",bgxmList); - } - - @Override - public Result getInputmdl(String yq) { - List labInputmdlList = lisWorkPageInfoMapper.getInputmdl(yq); - return new Result("0","获取数据成功！",labInputmdlList); - } - } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java index 4c2d917..2c83f9b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java @@ -3,7 +3,7 @@ package com.czlis.liswork.service.impl.xtwh; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabInputmdl; import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; -import com.czlis.liswork.mapper.xtwh.LabInputmdlMapper; +import com.czlis.interfaceCommon.mapper.LabInputmdlMapper; import com.czlis.liswork.pojo.DTO.LabInputmdlDTO; import com.czlis.liswork.service.LabInputmdlService; import lombok.extern.slf4j.Slf4j; diff --git a/liswork/src/main/resources/mapper/LabInputmdlMapper.xml b/liswork/src/main/resources/mapper/LabInputmdlMapper.xml deleted file mode 100644 index c782059..0000000 --- a/liswork/src/main/resources/mapper/LabInputmdlMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - insert into lab_inputmdl( - yq,mbmc,srbh,zdsr,qsybh,jsybh,yblx - )values( - #{yq},#{mbmc},#{srbh},#{zdsr},#{qsybh},#{jsybh},#{yblx} - ) - - - - insert into lab_inputmdldetail( - yq,mbmc,xh,xmdh,mrz - )values( - #{yq},#{mbmc},#{xh},#{xmdh},#{mrz} - ) - - - - update lab_inputmdl - - mbmc = #{mbmc}, - srbh = #{srbh}, - zdsr = #{zdsr}, - qsybh = #{qsybh}, - jsybh = #{jsybh}, - yblx = #{yblx}, - yq = #{yq},mbmc = #{mbmc} - - where yq = #{yq},mbmc = #{mbmc} - - - - update lab_inputmdldetail - - xmdh = #{xmdh}, - mrz = #{mrz}, - yq = #{yq},mbmc = #{mbmc},xh=#{xh} - - where yq = #{yq},mbmc = #{mbmc},xh=#{xh} - - - - delete from lab_inputmdl where yq = #{yq} and mbmc = #{mbmc} - - - - delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc} and xh = #{xh} - - - - diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index b386e6f..a0b1e98 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -76,7 +76,7 @@