From 0db6897c08882ca9d0b4cb143bf79ec05ddb7ba4 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 4 Dec 2024 16:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 234 +++++++++++++++++- .../mipsdl/service/hlfyyy/VA001Service.java | 1 - .../mipsdl/service/hlfyyy/VA004Service.java | 1 - .../mipsdl/service/hlfyyy/VA006Service.java | 40 +++ .../mipsdl/service/hlfyyy/VA010Service.java | 2 +- .../mipsdl/service/hlfyyy/VA015Service.java | 40 +++ .../mipsdl/thirddao/hlfyyy/VA006Mapper.java | 7 + .../mipsdl/thirddao/hlfyyy/VA015Mapper.java | 7 + .../mapper/master/hlfyyy/VA006Mapper.xml | 62 +++++ .../mapper/master/hlfyyy/VA015Mapper.xml | 62 +++++ 10 files changed, 447 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index 013174d..ac7c0e8 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -16,7 +16,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.client.hlfyyy.entity.InvCodeResultEntity; @@ -186,6 +185,10 @@ public class HlfyyyClient extends CommonHttpClient { @Resource private VA003Mapper va003Mapper; @Resource + private VA006Mapper va006Mapper; + @Resource + private VA006MxMapper va006MxMapper; + @Resource private VA010Mapper va010Mapper; @Resource private VA010MxMapper va010MxMapper; @@ -193,6 +196,10 @@ public class HlfyyyClient extends CommonHttpClient { private VA011Mapper va011Mapper; @Resource private VA011MxMapper va011MxMapper; + @Resource + private VA015Mapper va015Mapper; + @Resource + private VA015MxMapper va015MxMapper; /** * 拼接xml请求头 @@ -230,7 +237,6 @@ public class HlfyyyClient extends CommonHttpClient { udiwmsUnitRequest.setDatabaseProductName(getDataSourceType()); IPage iPage = va001Service.filterList(udiwmsUnitRequest); log.info("解析湖里妇幼返回往来单位，返回结果：{}", iPage.getRecords()); - PageInfo pageInfo = new PageInfo<>(iPage.getRecords()); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(iPage.getTotal()); pageSimpleResponse.setList(iPage.getRecords()); @@ -1471,6 +1477,19 @@ public class HlfyyyClient extends CommonHttpClient { } } + @Override + public BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { + if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + IPage iPage = va006Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + return this.covertSellOrderQx(udiwmsBasicSkPrescribeRequest, iPage); + } else { + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + IPage iPage = va015Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + return this.covertReturnOrderQx(udiwmsBasicSkPrescribeRequest, iPage); + } + + } /** @@ -1752,6 +1771,8 @@ public class HlfyyyClient extends CommonHttpClient { if (CollUtil.isNotEmpty(itemDetails)) { itemDetails.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + BeanUtils.copyProperties(entity,collectOrderBiz); + List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); if (CollUtil.isNotEmpty(basicUdirelEntities)) { BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); @@ -1762,12 +1783,12 @@ public class HlfyyyClient extends CommonHttpClient { collectOrderBiz.setGgxh(entity.getBzgg()); collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); - collectOrderBiz.setCount(IntUtil.value(entity.getCount())); + collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount())); collectOrderBiz.setThrCode(entity.getItemcode()); collectOrderBiz.setCpmctymc(entity.getItemname()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); - collectOrderBiz.setRemark1(entity.getRemark()); +// collectOrderBiz.setRemark1(entity.getRemark()); collectOrderBiz.setNameCode(entity.getItemcode()); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); @@ -1865,6 +1886,7 @@ public class HlfyyyClient extends CommonHttpClient { if (CollUtil.isNotEmpty(itemDetails)) { itemDetails.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + BeanUtils.copyProperties(entity,collectOrderBiz); List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); if (CollUtil.isNotEmpty(basicUdirelEntities)) { BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); @@ -1875,12 +1897,12 @@ public class HlfyyyClient extends CommonHttpClient { collectOrderBiz.setGgxh(entity.getBzgg()); collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); - collectOrderBiz.setCount(IntUtil.value(entity.getCount())); + collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount())); collectOrderBiz.setThrCode(entity.getItemcode()); collectOrderBiz.setCpmctymc(entity.getItemname()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); - collectOrderBiz.setRemark1(entity.getRemark()); +// collectOrderBiz.setRemark1(entity.getRemark()); collectOrderBiz.setNameCode(entity.getItemcode()); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); @@ -2207,4 +2229,204 @@ public class HlfyyyClient extends CommonHttpClient { } + /** + * 单据 + * + * @param udiwmsBasicSkPrescribeRequest + * @return + */ + private BaseResponse covertSellOrderQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage iPage) { + List headList = iPage.getRecords(); +// log.info("udiwmsBasicSkPrescribeRequest=="+udiwmsBasicSkPrescribeRequest+"====="+headList); + if (CollUtil.isNotEmpty(headList)) { + List codefks = headList.stream().map(VA006::getCode).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VA006Mx::getCodefk, codefks); + + List va006MxList = va006MxMapper.selectList(wrapper1); + Map> detailsMap = new HashMap<>(); + if (CollUtil.isNotEmpty(va006MxList)) { + detailsMap = va006MxList.stream() + .collect(Collectors.groupingBy(VA006Mx::getCodefk)); + } + + List ioCollectOrders = new ArrayList<>(); + Map> finalDetailsMap = detailsMap; + headList.forEach(item -> { + + StringBuilder errorMsg = new StringBuilder(); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + ioCollectOrder.setBillNo(item.getCode()); + ioCollectOrder.setFromType("HIS系统"); + ioCollectOrder.setFromCorp(item.getDeptcode()); + ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); + ioCollectOrder.setFromCorpName(item.getSickname()); + ioCollectOrder.setShipperName(item.getDeptname()); + if (item.getRemark().equals("门诊")) { + ioCollectOrder.setBusType("YPCF002"); + } else { + ioCollectOrder.setBusType("YPCF003"); + } + Date date = null; + try { + date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate()); + } catch (ParseException e) { + + } + ioCollectOrder.setBillTime(date); + ioCollectOrder.setCreateTime(new Date()); + ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); +// ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType()); + ioCollectOrder.setBackupOrderRemark1(item.getCode()); + +// ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); +// ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME()); +// ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO()); + ioCollectOrder.setUpdateTime(new Date()); + ioCollectOrder.setSplitStatus(0); + ioCollectOrder.setTagStatus(0); + List itemDetails = finalDetailsMap.get(item.getCode()); + List bizList = new ArrayList<>(); + if (CollUtil.isNotEmpty(itemDetails)) { + itemDetails.forEach(entity -> { + IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + BeanUtils.copyProperties(entity,collectOrderBiz); + + List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); + if (CollUtil.isNotEmpty(basicUdirelEntities)) { + BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); + collectOrderBiz.setRelId(basicUdirelEntity.getId()); + } else { + errorMsg.append(entity.getItemname()).append("字典未对照").append(";"); + } + + collectOrderBiz.setGgxh(entity.getGgxh()); + collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); + collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount())); + collectOrderBiz.setThrCode(entity.getItemcode()); + collectOrderBiz.setCpmctymc(entity.getItemname()); + collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); + +// collectOrderBiz.setRemark1(entity.getRemark()); + collectOrderBiz.setNameCode(entity.getItemcode()); + collectOrderBiz.setTagStatus(1); + collectOrderBiz.setUnTagCount(0); + bizList.add(collectOrderBiz); + }); + + } + if (StrUtil.isNotBlank(errorMsg)) { + ioCollectOrder.setErrorMsg(errorMsg.toString()); + ioCollectOrder.setTagStatus(4); + } + ioCollectOrder.setBizList(summarizeByCode(bizList)); + ioCollectOrders.add(ioCollectOrder); + + }); + + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(iPage.getTotal()); + pageSimpleResponse.setList(ioCollectOrders); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "未查询到数据!"); + } + } + private BaseResponse covertReturnOrderQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage iPage) { + List headList = iPage.getRecords(); +// log.info("udiwmsBasicSkPrescribeRequest=="+udiwmsBasicSkPrescribeRequest+"====="+headList); + if (CollUtil.isNotEmpty(headList)) { + List codefks = headList.stream().map(VA015::getCode).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VA015Mx::getCodefk, codefks); + + List va015MxList = va015MxMapper.selectList(wrapper1); + Map> detailsMap = new HashMap<>(); + if (CollUtil.isNotEmpty(va015MxList)) { + detailsMap = va015MxList.stream() + .collect(Collectors.groupingBy(VA015Mx::getCodefk)); + } + + List ioCollectOrders = new ArrayList<>(); + Map> finalDetailsMap = detailsMap; + headList.forEach(item -> { + + StringBuilder errorMsg = new StringBuilder(); + IoCollectOrder ioCollectOrder = new IoCollectOrder(); + ioCollectOrder.setBillNo(item.getCode()); + ioCollectOrder.setFromType("HIS系统"); + ioCollectOrder.setFromCorp(item.getDeptcode()); + ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); + ioCollectOrder.setFromCorpName(item.getSickname()); + ioCollectOrder.setShipperName(item.getDeptname()); + if (item.getRemark().equals("门诊")) { + ioCollectOrder.setBusType("YPCF002"); + } else { + ioCollectOrder.setBusType("YPCF003"); + } + Date date = null; + try { + date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate()); + } catch (ParseException e) { + + } + ioCollectOrder.setBillTime(date); + ioCollectOrder.setCreateTime(new Date()); + ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); +// ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType()); + ioCollectOrder.setBackupOrderRemark1(item.getCode()); + +// ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); +// ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME()); +// ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO()); + ioCollectOrder.setUpdateTime(new Date()); + ioCollectOrder.setSplitStatus(0); + ioCollectOrder.setTagStatus(0); + List itemDetails = finalDetailsMap.get(item.getCode()); + List bizList = new ArrayList<>(); + if (CollUtil.isNotEmpty(itemDetails)) { + itemDetails.forEach(entity -> { + IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + BeanUtils.copyProperties(entity,collectOrderBiz); + List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); + if (CollUtil.isNotEmpty(basicUdirelEntities)) { + BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); + collectOrderBiz.setRelId(basicUdirelEntity.getId()); + } else { + errorMsg.append(entity.getItemname()).append("字典未对照").append(";"); + } + + collectOrderBiz.setGgxh(entity.getGgxh()); + collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); + collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount())); + collectOrderBiz.setThrCode(entity.getItemcode()); + collectOrderBiz.setCpmctymc(entity.getItemname()); + collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); + +// collectOrderBiz.setRemark1(entity.getRemark()); + collectOrderBiz.setNameCode(entity.getItemcode()); + collectOrderBiz.setTagStatus(1); + collectOrderBiz.setUnTagCount(0); + bizList.add(collectOrderBiz); + }); + + } + if (StrUtil.isNotBlank(errorMsg)) { + ioCollectOrder.setErrorMsg(errorMsg.toString()); + ioCollectOrder.setTagStatus(4); + } + ioCollectOrder.setBizList(summarizeByCode(bizList)); + ioCollectOrders.add(ioCollectOrder); + + }); + + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(iPage.getTotal()); + pageSimpleResponse.setList(ioCollectOrders); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "未查询到数据!"); + } + } + } diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java index abd6fbe..705642d 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java @@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.hlfyyy; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; import com.glxp.mipsdl.entity.hlfyyy.VA010; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import com.glxp.mipsdl.thirddao.hlfyyy.VA001Mapper; diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java index f2e1363..d8471e5 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java @@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.hlfyyy; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; import com.glxp.mipsdl.entity.hlfyyy.VA010; import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; import com.glxp.mipsdl.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java index 1a6e040..ced7f0b 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java @@ -1,10 +1,50 @@ package com.glxp.mipsdl.service.hlfyyy; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.hlfyyy.VA010; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import com.glxp.mipsdl.thirddao.hlfyyy.VA006Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA010Mapper; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.mipsdl.entity.hlfyyy.VA006; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + @Service public class VA006Service extends ServiceImpl { + @Resource + private VA006Mapper va006Mapper; + @Value("${DSF_XML_SQL_TYPE:Mysql}") + private String defXmlSqlType; + public IPage getList(Page page , UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest){ + IPage iPage = va006Mapper.getList(page,udiwmsBasicSkPrescribeRequest); + List list = iPage.getRecords(); + List listNew = new ArrayList<>(); + list.sort( Comparator.comparing(VA006::getPrescribedate)); + if(list!=null && list.size() >0){ + String lastSql = ""; + if(defXmlSqlType.equals("Mysql")){ + lastSql = "AND limit = 1"; + + }else if(defXmlSqlType.equals("Oracle")){ + lastSql = "AND rownum = 1"; + } + for (VA006 va006 : list) { + + + VA006 va006New = va006Mapper.selectOne(new QueryWrapper().eq("code",va006.getCode()).last(lastSql)); + listNew.add(va006New); + } + } + iPage.setRecords(listNew); + return iPage; + } } diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java index ee8b710..6c4c270 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java @@ -46,6 +46,6 @@ public class VA010Service extends ServiceImpl { iPage.setRecords(listNew); return iPage; - }; + } } diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java index 83b723b..e34d736 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java @@ -1,10 +1,50 @@ package com.glxp.mipsdl.service.hlfyyy; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.hlfyyy.VA010; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; +import com.glxp.mipsdl.thirddao.hlfyyy.VA010Mapper; import com.glxp.mipsdl.thirddao.hlfyyy.VA015Mapper; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.mipsdl.entity.hlfyyy.VA015; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + @Service public class VA015Service extends ServiceImpl { + @Resource + private VA015Mapper va015Mapper; + @Value("${DSF_XML_SQL_TYPE:Mysql}") + private String defXmlSqlType; + public IPage getList(Page page , UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest){ + IPage iPage = va015Mapper.getList(page,udiwmsBasicSkPrescribeRequest); + List list = iPage.getRecords(); + List listNew = new ArrayList<>(); + list.sort( Comparator.comparing(VA015::getPrescribedate)); + if(list!=null && list.size() >0){ + String lastSql = ""; + if(defXmlSqlType.equals("Mysql")){ + lastSql = "AND limit = 1"; + + }else if(defXmlSqlType.equals("Oracle")){ + lastSql = "AND rownum = 1"; + } + for (VA015 va015 : list) { + + + VA015 va015New = va015Mapper.selectOne(new QueryWrapper().eq("code",va015.getCode()).last(lastSql)); + listNew.add(va015New); + } + } + iPage.setRecords(listNew); + return iPage; + } } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java index 92895c5..3f44810 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java @@ -2,10 +2,17 @@ package com.glxp.mipsdl.thirddao.hlfyyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.entity.hlfyyy.VA006; +import com.glxp.mipsdl.entity.hlfyyy.VA010; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper @DS("hlfyyySql") public interface VA006Mapper extends BaseMapper { + IPage getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java index 4448682..8a61883 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java @@ -2,10 +2,17 @@ package com.glxp.mipsdl.thirddao.hlfyyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.hlfyyy.VA006; import com.glxp.mipsdl.entity.hlfyyy.VA015; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper @DS("hlfyyySql") public interface VA015Mapper extends BaseMapper { + IPage getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + } diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml index 807d136..314cfe4 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml @@ -20,4 +20,66 @@ CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, REMARK + + diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml index 3d106de..efa4861 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml @@ -20,4 +20,66 @@ CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, REMARK + +