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 8d7a9b7..9660d7e 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -1999,7 +1999,7 @@ public class HlfyyyClient extends CommonHttpClient { .eq(VA013::getSETTLE_NO, va010.getCode()) ); - log.error("va012==="+va013List); + log.error("va013List==="+va013List); if ( CollUtil.isNotEmpty(va013List)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); log.error("collectOrderBizResponseList==="+collectOrderBizResponseList); 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 3009575..caed09f 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java @@ -24,6 +24,7 @@ public class VA010Service extends ServiceImpl { @Value("${DSF_XML_SQL_TYPE:MySql}") private String defXmlSqlType; public IPage getList(Page page , UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest){ + IPage iPage = va010Mapper.getList(page,udiwmsBasicSkPrescribeRequest); List list = iPage.getRecords(); List listNew = new ArrayList<>(); diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.java index 8faef5c..2f95870 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.java @@ -2,11 +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.VA010; import com.glxp.mipsdl.entity.hlfyyy.VA013; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper @DS("hlfyyySql") public interface VA013Mapper extends BaseMapper { + IPage getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); } diff --git a/src/main/resources/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.xml b/src/main/resources/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.xml index 2150128..90035bb 100644 --- a/src/main/resources/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.xml +++ b/src/main/resources/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.xml @@ -12,4 +12,78 @@ MEMO, MDTRT_SETL_TYPE, DRUGTRACINFO, APPLY_NO, SETTLE_NO, SICK_ID, MATERIAL_SPEC, MATERIAL_CERTIFICATE_NO, MODEL_NUMBER, FACTORY_NAME, UNIT + + diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml index b9e75b0..9982444 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml @@ -24,14 +24,19 @@ CODE FROM v_a010 - WHERE - 1 = 1 + WHERE 1=1 AND REMARK ='门诊' + AND code = ( + SELECT RxNo + FROM v_a013 t + WHERE t.sick_id = v_a010.sickcode + AND t.RxNo = v_a010.code group by RxNo + ) AND REMARK !='门诊'