From 4c530f05d1c86f5735b5c02ddef0f441e54931df Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 26 Nov 2024 15:56:46 +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=20=E7=AC=AC=E4=BA=8C=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HlfyyyClient.java} | 242 +++++++++++------- .../entity/InvCodeResultEntity.java | 2 +- .../entity/InvProjectResultEntity.java | 2 +- .../entity/InvResultEntity.java | 2 +- .../entity/{hlhyxyy => hlfyyy}/VA001.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA002.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA003.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA004.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA005.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA006.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA006Mx.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA010.java | 4 +- .../glxp/mipsdl/entity/hlfyyy/VA010Mx.java | 76 ++++++ .../entity/{hlhyxyy => hlfyyy}/VA011.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA011Mx.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA015.java | 4 +- .../entity/{hlhyxyy => hlfyyy}/VA015Mx.java | 4 +- .../glxp/mipsdl/req/base/ListPageRequest.java | 20 +- .../base/UdiwmsBasicSkPrescribeRequest.java | 1 + .../mipsdl/req/base/UdiwmsProductRequest.java | 4 + .../{hlhyxyy => hlfyyy}/VA001Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA002Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA003Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA004Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA005Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA006MxService.java | 8 +- .../{hlhyxyy => hlfyyy}/VA006Service.java | 8 +- .../mipsdl/service/hlfyyy/VA010MxService.java | 10 + .../mipsdl/service/hlfyyy/VA010Service.java | 31 +++ .../{hlhyxyy => hlfyyy}/VA011MxService.java | 8 +- .../{hlhyxyy => hlfyyy}/VA011Service.java | 8 +- .../{hlhyxyy => hlfyyy}/VA015MxService.java | 8 +- .../{hlhyxyy => hlfyyy}/VA015Service.java | 8 +- .../mipsdl/service/hlhyxyy/VA010Service.java | 12 - .../{hlhyxyy => hlfyyy}/VA001Mapper.java | 6 +- .../{hlhyxyy => hlfyyy}/VA002Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA003Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA004Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA005Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA006Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA006MxMapper.java | 8 +- .../mipsdl/thirddao/hlfyyy/VA010Mapper.java | 16 ++ .../mipsdl/thirddao/hlfyyy/VA010MxMapper.java | 11 + .../{hlhyxyy => hlfyyy}/VA011Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA011MxMapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA015Mapper.java | 8 +- .../{hlhyxyy => hlfyyy}/VA015MxMapper.java | 8 +- .../mipsdl/thirddao/hlhyxyy/VA010Mapper.java | 9 - src/main/resources/application-dev.yml | 2 +- src/main/resources/application-pro.yml | 2 +- .../{hlhyxyy => hlfyyy}/VA001Mapper.xml | 6 +- .../{hlhyxyy => hlfyyy}/VA002Mapper.xml | 12 +- .../{hlhyxyy => hlfyyy}/VA003Mapper.xml | 12 +- .../{hlhyxyy => hlfyyy}/VA004Mapper.xml | 6 +- .../{hlhyxyy => hlfyyy}/VA005Mapper.xml | 6 +- .../{hlhyxyy => hlfyyy}/VA006Mapper.xml | 8 +- .../{hlhyxyy => hlfyyy}/VA006MxMapper.xml | 8 +- .../mapper/master/hlfyyy/VA010Mapper.xml | 67 +++++ .../mapper/master/hlfyyy/VA010MxMapper.xml | 33 +++ .../{hlhyxyy => hlfyyy}/VA011Mapper.xml | 8 +- .../{hlhyxyy => hlfyyy}/VA011MxMapper.xml | 10 +- .../{hlhyxyy => hlfyyy}/VA015Mapper.xml | 8 +- .../{hlhyxyy => hlfyyy}/VA015MxMapper.xml | 8 +- .../mapper/master/hlhyxyy/VA010Mapper.xml | 23 -- 64 files changed, 558 insertions(+), 321 deletions(-) rename src/main/java/com/glxp/mipsdl/client/{hlhyxyy/HlhyxyyClient.java => hlfyyy/HlfyyyClient.java} (94%) rename src/main/java/com/glxp/mipsdl/client/{hlhyxyy => hlfyyy}/entity/InvCodeResultEntity.java (95%) rename src/main/java/com/glxp/mipsdl/client/{hlhyxyy => hlfyyy}/entity/InvProjectResultEntity.java (95%) rename src/main/java/com/glxp/mipsdl/client/{hlhyxyy => hlfyyy}/entity/InvResultEntity.java (97%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA001.java (86%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA002.java (94%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA003.java (94%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA004.java (81%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA005.java (82%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA006.java (88%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA006Mx.java (90%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA010.java (88%) create mode 100644 src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010Mx.java rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA011.java (89%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA011Mx.java (92%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA015.java (88%) rename src/main/java/com/glxp/mipsdl/entity/{hlhyxyy => hlfyyy}/VA015Mx.java (90%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA001Service.java (82%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA002Service.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA003Service.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA004Service.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA005Service.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA006MxService.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA006Service.java (50%) create mode 100644 src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010MxService.java create mode 100644 src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA011MxService.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA011Service.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA015MxService.java (50%) rename src/main/java/com/glxp/mipsdl/service/{hlhyxyy => hlfyyy}/VA015Service.java (50%) delete mode 100644 src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA010Service.java rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA001Mapper.java (66%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA002Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA003Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA004Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA005Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA006Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA006MxMapper.java (51%) create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java create mode 100644 src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010MxMapper.java rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA011Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA011MxMapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA015Mapper.java (51%) rename src/main/java/com/glxp/mipsdl/thirddao/{hlhyxyy => hlfyyy}/VA015MxMapper.java (51%) delete mode 100644 src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA010Mapper.java rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA001Mapper.xml (91%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA002Mapper.xml (92%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA003Mapper.xml (91%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA004Mapper.xml (76%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA005Mapper.xml (79%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA006Mapper.xml (85%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA006MxMapper.xml (88%) create mode 100644 src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml create mode 100644 src/main/resources/mybatis/mapper/master/hlfyyy/VA010MxMapper.xml rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA011Mapper.xml (87%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA011MxMapper.xml (89%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA015Mapper.xml (85%) rename src/main/resources/mybatis/mapper/master/{hlhyxyy => hlfyyy}/VA015MxMapper.xml (88%) delete mode 100644 src/main/resources/mybatis/mapper/master/hlhyxyy/VA010Mapper.xml diff --git a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/HlhyxyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java similarity index 94% rename from src/main/java/com/glxp/mipsdl/client/hlhyxyy/HlhyxyyClient.java rename to src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index 823ecdf..5c6309d 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/HlhyxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.client.hlhyxyy; +package com.glxp.mipsdl.client.hlfyyy; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.glxp.mipsdl.client.CommonHttpClient; -import com.glxp.mipsdl.client.hlhyxyy.entity.InvCodeResultEntity; -import com.glxp.mipsdl.client.hlhyxyy.entity.InvProjectResultEntity; -import com.glxp.mipsdl.client.hlhyxyy.entity.InvResultEntity; +import com.glxp.mipsdl.client.hlfyyy.entity.InvCodeResultEntity; +import com.glxp.mipsdl.client.hlfyyy.entity.InvProjectResultEntity; +import com.glxp.mipsdl.client.hlfyyy.entity.InvResultEntity; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.BusTypeConstant; import com.glxp.mipsdl.constant.ConstantType; @@ -37,7 +37,7 @@ import com.glxp.mipsdl.entity.auth.AuthUserEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.*; import com.glxp.mipsdl.entity.ctqyy.*; -import com.glxp.mipsdl.entity.hlhyxyy.VA001; +import com.glxp.mipsdl.entity.hlfyyy.*; import com.glxp.mipsdl.entity.inout.*; import com.glxp.mipsdl.entity.system.ThrYbSetupMapper; import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; @@ -57,13 +57,14 @@ import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.basic.RelCodeDetailService; -import com.glxp.mipsdl.service.hlhyxyy.*; +import com.glxp.mipsdl.service.hlfyyy.*; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; import com.glxp.mipsdl.service.yb.YbClient; import com.glxp.mipsdl.thirddao.ctqyy.*; +import com.glxp.mipsdl.thirddao.hlfyyy.*; import com.glxp.mipsdl.util.*; import lombok.extern.slf4j.Slf4j; import org.dom4j.Document; @@ -74,12 +75,14 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @Slf4j @Service(value = "100015HttpClient") -public class HlhyxyyClient extends CommonHttpClient { +public class HlfyyyClient extends CommonHttpClient { private final String[] buyType_3501 = {"24"}; private final String[] buyType_3502 = {"7", "6", "5", "4", "1", "16", "12", "28", "35"}; private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; @@ -152,8 +155,7 @@ public class HlhyxyyClient extends CommonHttpClient { @Resource private VA001Service va001Service; - @Resource - private VA003Service va003Service; + @Resource private VA005Service va005Service; @Resource @@ -175,8 +177,16 @@ public class HlhyxyyClient extends CommonHttpClient { @Resource private VA015Service va015Service; - - + @Resource + private VA003Mapper va003Mapper; + @Resource + private VA010Mapper va010Mapper; + @Resource + private VA010MxMapper va010MxMapper; + @Resource + private VA011Mapper va011Mapper; + @Resource + private VA011MxMapper va011MxMapper; /** * 拼接xml请求头 @@ -213,7 +223,7 @@ public class HlhyxyyClient extends CommonHttpClient { public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { udiwmsUnitRequest.setDatabaseProductName(getDataSourceType()); List list = va001Service.filterList(udiwmsUnitRequest); - log.info("解析四川武平县医院返回往来单位，返回结果：{}", list); + log.info("解析湖里妇幼返回往来单位，返回结果：{}", list); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -278,30 +288,53 @@ public class HlhyxyyClient extends CommonHttpClient { baseResponse.setData(map); return baseResponse; } catch (Exception e) { - log.error("解析长泰区医院智业接口返回产品信息字典数据异常，返回结果：{}", response); + log.error("解析湖里妇幼医院智业接口返回产品信息字典数据异常，返回结果：{}", response); log.error("异常信息：{}", e); return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); } } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + List list = udiwmsProductRequest.getThrProductsEntities(); + List codeList = new ArrayList(); + List nameList = new ArrayList(); + List registerNoList = new ArrayList(); + + if(list!=null && list.size() >0 ){ + for (ThrProductsEntity thrProductsEntity : list) { + if(StringUtils.isNotEmpty(thrProductsEntity.getCode())){ + codeList.add(thrProductsEntity.getCode()); + + } + if(StringUtils.isNotEmpty(thrProductsEntity.getName())){ + nameList.add(thrProductsEntity.getName()); + + } + if(StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())){ + registerNoList.add(thrProductsEntity.getRegisterNo()); + + } + + } + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode()); - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VYpzsPhysicDict::getPHYSIC_NAME, udiwmsProductRequest.getName()); - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VYpzsPhysicDict::getPHYSIC_NO, udiwmsProductRequest.getRegisterNo()); - IPage page = vYpzsPhysicDictMapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); - List physicDictEntities = page.getRecords(); + wrapper.in(codeList!=null && codeList.size()>0, VA003::getCode,codeList); + wrapper.in(nameList!=null && nameList.size()>0, VA003::getName, nameList); + wrapper.in(registerNoList!=null && registerNoList.size()>0, VA003::getRegisterno, registerNoList); + // 保留之前的查询方法怕有用到 + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VA003::getCode, udiwmsProductRequest.getCode()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VA003::getName, udiwmsProductRequest.getName()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VA003::getRegisterno, udiwmsProductRequest.getRegisterNo()); + + wrapper.eq(VA003::getRemark,"Y"); + IPage page = va003Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); + List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; if (CollUtil.isNotEmpty(physicDictEntities)) { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - products.setCode(dict.getPHYSIC_CODE()); - products.setName(dict.getPHYSIC_NAME()); - products.setMeasname(dict.getPACK_UNIT()); - products.setSpec(dict.getPACK_SPEC()); - products.setYbbm(dict.getCOUNTRY_CODE()); - products.setPrepnSpec(dict.getPHYSIC_SPEC()); - products.setPrepnUnit(dict.getPHYSIC_UNIT()); + BeanUtil.copyProperties(dict,products); + products.setSpec(dict.getBzgg()); products.setProductType(2); return products; }).collect(Collectors.toList()); @@ -311,7 +344,7 @@ public class HlhyxyyClient extends CommonHttpClient { pageSimpleResponse.setList(thrProductsEntityList); return ResultVOUtils.success(pageSimpleResponse); } - log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType()); + log.error("解析湖里妇幼医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType()); return ResultVOUtils.error(500, "医疗类型不正确，productType：" + udiwmsProductRequest.getProductType()); } @@ -1396,28 +1429,15 @@ public class HlhyxyyClient extends CommonHttpClient { @Override public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); - String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); - wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime); - wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime); - - String code = udiwmsBasicSkPrescribeRequest.getCode(); - String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName(); - String key = udiwmsBasicSkPrescribeRequest.getKey(); - wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); - wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, key) - .or().like(VInsurNationGoodsPhysic::getRXNO, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NAME, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NO, key) - ); - wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); - // 拉取处方时，改成拉取v_ypzs_pres_info - IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), - udiwmsBasicSkPrescribeRequest); - - return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); + IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),udiwmsBasicSkPrescribeRequest); +// List list = iPage.getRecords(); +// PageInfo pageInfo = new PageInfo<>(list); +// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); +// pageSimpleResponse.setTotal(iPage.getTotal()); +// pageSimpleResponse.setList(list); + + return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, iPage); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1669,86 +1689,111 @@ public class HlhyxyyClient extends CommonHttpClient { * @param udiwmsBasicSkPrescribeRequest * @return */ - private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { - List presInfoEntities = page.getRecords(); - List vInsurNationGoodsPhysics = new ArrayList<>(); - if (CollUtil.isNotEmpty(presInfoEntities)) { - List collect = presInfoEntities.stream().map(VYpzsPresInfo::getPRESCRIBE_NUMBER).collect(Collectors.toList()); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.in(VYpzsPresInfo::getPRESCRIBE_NUMBER, collect); - vInsurNationGoodsPhysics = vYpzsPresInfoMapper.selectList(wrapper1); - } + private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage iPage) { + List headList = iPage.getRecords(); + + if (CollUtil.isNotEmpty(headList)) { + List codefks = headList.stream().map(VA010::getCode).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VA010Mx::getCodefk, codefks); + List a010details = va010MxMapper.selectList(wrapper1); + Map> detailsMap = new HashMap<>(); + if (CollUtil.isNotEmpty(a010details)) { + detailsMap = a010details.stream() + .collect(Collectors.groupingBy(VA010Mx::getCodefk)); + } - // TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic - if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { - Map> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream() - .collect(Collectors.groupingBy(VYpzsPresInfo::getPHYSIC_CODE)); List ioCollectOrders = new ArrayList<>(); - groupedByPrescribeNumber.forEach((key, value) -> { - VYpzsPresInfo presInfoEntity = value.get(0); + Map> finalDetailsMap = detailsMap; + headList.forEach(item -> { + StringBuilder errorMsg = new StringBuilder(); IoCollectOrder ioCollectOrder = new IoCollectOrder(); - ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER()); + ioCollectOrder.setBillNo(item.getCode()); ioCollectOrder.setFromType("HIS系统"); - ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID()); + ioCollectOrder.setFromCorp(item.getDeptcode()); ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); - ioCollectOrder.setFromCorpName(presInfoEntity.getSICK_NAME()); - Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME()); + ioCollectOrder.setFromCorpName(item.getSickname()); + ioCollectOrder.setShipperName(item.getDeptname()); + Date date = null; + try { + date = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(item.getPrescribedate()); + } catch (ParseException e) { + + } ioCollectOrder.setBillTime(date); ioCollectOrder.setCreateTime(new Date()); ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); - ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO()); - ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); + 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<>(); - value.forEach(entity -> { - IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); - List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); - if (CollUtil.isNotEmpty(basicUdirelEntities)) { - BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); - collectOrderBiz.setRelId(basicUdirelEntity.getId()); - } else { - errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";"); - } + if (CollUtil.isNotEmpty(itemDetails)) { + itemDetails.forEach(entity -> { + IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); + 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(";"); + } -// List vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getPRESCRIBE_NUMBER()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getPHYSIC_CODE())); + collectOrderBiz.setGgxh(entity.getBzgg()); + collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); + collectOrderBiz.setCount(IntUtil.value(entity.getCount())); + collectOrderBiz.setThrCode(entity.getItemcode()); + collectOrderBiz.setCpmctymc(entity.getItemname()); + collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); -// if (CollUtil.isNotEmpty(vYpzsPresInfos)) { -// VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0); -// -// } - collectOrderBiz.setGgxh(entity.getPACK_SPEC()); - collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT()); - collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY())); - collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); - collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); - collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); - collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE()); -// collectOrderBiz.setRemark1(entity.get() + ""); + collectOrderBiz.setRemark1(entity.getRemark()); + collectOrderBiz.setNameCode(entity.getItemcode()); + collectOrderBiz.setTagStatus(1); + collectOrderBiz.setUnTagCount(0); + bizList.add(collectOrderBiz); + }); - collectOrderBiz.setTagStatus(1); - collectOrderBiz.setUnTagCount(0); - bizList.add(collectOrderBiz); - }); + } if (StrUtil.isNotBlank(errorMsg)) { ioCollectOrder.setErrorMsg(errorMsg.toString()); ioCollectOrder.setTagStatus(4); } - ioCollectOrder.setBizList(bizList); + ioCollectOrder.setBizList(summarizeByCode(bizList)); ioCollectOrders.add(ioCollectOrder); + }); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setTotal(iPage.getTotal()); pageSimpleResponse.setList(ioCollectOrders); return ResultVOUtils.success(pageSimpleResponse); } else { return ResultVOUtils.error(500, "下载失败!"); } } + public static List summarizeByCode(List bizList) { + Map summarizedMap = new HashMap<>(); + + for (IoCollectOrderBiz biz : bizList) { + String code = biz.getThrCode(); + + if (summarizedMap.containsKey(code)) { + IoCollectOrderBiz existingBiz = summarizedMap.get(code); + existingBiz.setCount(existingBiz.getCount() + biz.getCount()); + } else { + summarizedMap.put(code, biz); + } + } + + return new ArrayList<>(summarizedMap.values()); + } private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { List presInfoEntities = page.getRecords(); @@ -1823,6 +1868,7 @@ public class HlhyxyyClient extends CommonHttpClient { } + public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 // String stoout_no = ioCollectOrder.getBackupOrderRemark1(); diff --git a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvCodeResultEntity.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvCodeResultEntity.java similarity index 95% rename from src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvCodeResultEntity.java rename to src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvCodeResultEntity.java index ab787d6..525f1e4 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvCodeResultEntity.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvCodeResultEntity.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.client.hlhyxyy.entity; +package com.glxp.mipsdl.client.hlfyyy.entity; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvProjectResultEntity.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvProjectResultEntity.java similarity index 95% rename from src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvProjectResultEntity.java rename to src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvProjectResultEntity.java index 6a57f3d..e9032c8 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvProjectResultEntity.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvProjectResultEntity.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.client.hlhyxyy.entity; +package com.glxp.mipsdl.client.hlfyyy.entity; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvResultEntity.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvResultEntity.java similarity index 97% rename from src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvResultEntity.java rename to src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvResultEntity.java index d680664..8120eca 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlhyxyy/entity/InvResultEntity.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/entity/InvResultEntity.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.client.hlhyxyy.entity; +package com.glxp.mipsdl.client.hlfyyy.entity; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA001.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA001.java similarity index 86% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA001.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA001.java index 87c3ad4..53b970c 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA001.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA001.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA002.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java similarity index 94% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA002.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java index bb45aa7..7e6c55f 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA002.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA003.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA003.java similarity index 94% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA003.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA003.java index 2290796..b1e014b 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA003.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA003.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA004.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA004.java similarity index 81% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA004.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA004.java index d7dd476..cf6759d 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA004.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA004.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA005.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA005.java similarity index 82% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA005.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA005.java index ef0681e..f304e70 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA005.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA005.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006.java similarity index 88% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006.java index 5b60ec4..c6725fa 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006Mx.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006Mx.java similarity index 90% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006Mx.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006Mx.java index 4343a22..57b26c9 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA006Mx.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA006Mx.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA010.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010.java similarity index 88% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA010.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010.java index 8572c43..ffe0ec2 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA010.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010Mx.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010Mx.java new file mode 100644 index 0000000..53e80c4 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA010Mx.java @@ -0,0 +1,76 @@ +package com.glxp.mipsdl.entity.hlfyyy; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 药品处方查询-明细 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "v_a010_mx") +public class VA010Mx implements Serializable { + @TableField(value = "CODEFK") + private String codefk; + + @TableField(value = "THRID") + private String thrid; + + @TableField(value = "ITEMNAME") + private String itemname; + + @TableField(value = "ITEMCODE") + private String itemcode; + + @TableField(value = "MEASURECOUNT") + private String measurecount; + + @TableField(value = "MEASUREUNIT") + private String measureunit; + + @TableField(value = "CATEGORY") + private String category; + + @TableField(value = "FREQUENCY") + private String frequency; + + @TableField(value = "`COUNT`") + private String count; + + @TableField(value = "BZGG") + private String bzgg; + + @TableField(value = "PACKUNIT") + private String packunit; + + @TableField(value = "PREPNSPEC") + private String prepnspec; + + @TableField(value = "PREPNUNIT") + private String prepnunit; + + @TableField(value = "MEASNAME") + private String measname; + + @TableField(value = "PRICE") + private String price; + + @TableField(value = "RETAILPRICE") + private String retailprice; + + @TableField(value = "AMOUNT") + private String amount; + + @TableField(value = "REMARK") + private String remark; + + @TableField(value = "DRUGLIST") + private String druglist; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011.java similarity index 89% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011.java index 141fafa..492e7be 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011Mx.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java similarity index 92% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011Mx.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java index 056ec23..1a1e145 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA011Mx.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015.java similarity index 88% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015.java index d175037..005d59c 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015Mx.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015Mx.java similarity index 90% rename from src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015Mx.java rename to src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015Mx.java index 1409ac2..05ffc18 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlhyxyy/VA015Mx.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA015Mx.java @@ -1,8 +1,6 @@ -package com.glxp.mipsdl.entity.hlhyxyy; +package com.glxp.mipsdl.entity.hlfyyy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java b/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java index 2dfa465..cf10aff 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java @@ -1,21 +1,29 @@ package com.glxp.mipsdl.req.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + /** * 接口分页参数 */ @Data public class ListPageRequest { - /** - * 页码 - */ + @Min(message = "分页参数错误", value = 1) private Integer page; - /** - * 条数 - */ + + @Min(value = 1, message = "分页参数不能小于1") + @Max(value = 500, message = "分页参数不能大于500") private Integer limit; + private String orderBy; + private String sort; + + public Page getPageObj() { + return new Page(this.page == null ? 1 : this.page, this.limit == null ? 10 : this.limit); + } } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java index ae765d4..a434b17 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -136,5 +136,6 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest { private String databaseProductName; private String IN_HOSP; + } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java index ed518ba..dabef4e 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java @@ -1,13 +1,17 @@ package com.glxp.mipsdl.req.base; import com.glxp.mipsdl.constant.Constants; +import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; import lombok.Data; +import java.util.List; + /** * 产品信息查询接口参数 */ @Data public class UdiwmsProductRequest extends ListPageRequest { + private List thrProductsEntities; /** * 产品编码 diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA001Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java similarity index 82% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA001Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java index c1a07cf..52d23ce 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA001Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java @@ -1,14 +1,14 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; import com.github.pagehelper.PageHelper; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA001Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA001Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; + import java.util.Collections; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA001; +import com.glxp.mipsdl.entity.hlfyyy.VA001; @Service public class VA001Service extends ServiceImpl { public List filterList(UdiwmsUnitRequest udiwmsUnitRequest) { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA002Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA002Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA002Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA002Service.java index cb7404a..c1eec9f 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA002Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA002Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA002Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA002Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA002; +import com.glxp.mipsdl.entity.hlfyyy.VA002; @Service public class VA002Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA003Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA003Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA003Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA003Service.java index e141f1e..0cc2740 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA003Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA003Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA003Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA003Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA003; +import com.glxp.mipsdl.entity.hlfyyy.VA003; @Service public class VA003Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA004Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA004Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java index 4ae3849..07ff986 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA004Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA004Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA004Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA004; +import com.glxp.mipsdl.entity.hlfyyy.VA004; @Service public class VA004Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA005Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA005Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA005Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA005Service.java index cd429dd..85c48b9 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA005Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA005Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA005Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA005Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA005; +import com.glxp.mipsdl.entity.hlfyyy.VA005; @Service public class VA005Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006MxService.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006MxService.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006MxService.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006MxService.java index dcbc5c6..98cba16 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006MxService.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006MxService.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA006MxMapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA006MxMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA006Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA006Mx; @Service public class VA006MxService extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java index d2b5b6d..1a6e040 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA006Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA006Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA006Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA006; +import com.glxp.mipsdl.entity.hlfyyy.VA006; @Service public class VA006Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010MxService.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010MxService.java new file mode 100644 index 0000000..6351fdf --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010MxService.java @@ -0,0 +1,10 @@ +package com.glxp.mipsdl.service.hlfyyy; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.mipsdl.entity.hlfyyy.VA010Mx; +import com.glxp.mipsdl.thirddao.hlfyyy.VA010MxMapper; +@Service +public class VA010MxService extends ServiceImpl { + +} diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java new file mode 100644 index 0000000..f29ebe2 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java @@ -0,0 +1,31 @@ +package com.glxp.mipsdl.service.hlfyyy; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; +import com.glxp.mipsdl.thirddao.hlfyyy.VA010Mapper; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.mipsdl.entity.hlfyyy.VA010; +@Service +public class VA010Service extends ServiceImpl { + @Resource + private VA010Mapper va010Mapper; + public IPage getList(Page page , UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest){ + IPage iPage = va010Mapper.getList(page,udiwmsBasicSkPrescribeRequest); +// List list = iPage.getRecords(); +// List codeList = new ArrayList<>(); +// if(list!=null && list.size() >0){ +// for (VA010 va010 : list) { +// codeList.add(va010.getCode()); +// } +// List listNew = va010Mapper.selectList(new QueryWrapper().in("code",codeList).groupBy("code")); +// iPage.setRecords(listNew); +// } + + return iPage; + }; + +} diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011MxService.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011MxService.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011MxService.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011MxService.java index aaa81bd..8aaf1ac 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011MxService.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011MxService.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA011MxMapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA011MxMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA011Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA011Mx; @Service public class VA011MxService extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java index 30acd17..beea632 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA011Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA011Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA011Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA011; +import com.glxp.mipsdl.entity.hlfyyy.VA011; @Service public class VA011Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015MxService.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015MxService.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015MxService.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015MxService.java index 2424e8c..7b6af22 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015MxService.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015MxService.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA015MxMapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA015MxMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA015Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA015Mx; @Service public class VA015MxService extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java similarity index 50% rename from src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015Service.java rename to src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java index 1a6a7e8..83b723b 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA015Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java @@ -1,11 +1,9 @@ -package com.glxp.mipsdl.service.hlhyxyy; +package com.glxp.mipsdl.service.hlfyyy; -import com.glxp.mipsdl.thirddao.hlhyxyy.VA015Mapper; +import com.glxp.mipsdl.thirddao.hlfyyy.VA015Mapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA015; +import com.glxp.mipsdl.entity.hlfyyy.VA015; @Service public class VA015Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA010Service.java b/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA010Service.java deleted file mode 100644 index 7650ddb..0000000 --- a/src/main/java/com/glxp/mipsdl/service/hlhyxyy/VA010Service.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.glxp.mipsdl.service.hlhyxyy; - -import com.glxp.mipsdl.thirddao.hlhyxyy.VA010Mapper; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.mipsdl.entity.hlhyxyy.VA010; -@Service -public class VA010Service extends ServiceImpl { - -} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA001Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java similarity index 66% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA001Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java index 6451769..b74ad84 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA001Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java @@ -1,13 +1,15 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA001; +import com.glxp.mipsdl.entity.hlfyyy.VA001; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper +@DS("hlfyyySql") public interface VA001Mapper extends BaseMapper { List filterList(UdiwmsUnitRequest udiwmsUnitRequest); diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA002Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA002Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA002Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA002Mapper.java index 33ef6a0..d870d25 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA002Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA002Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA002; +import com.glxp.mipsdl.entity.hlfyyy.VA002; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA002Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA003Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA003Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA003Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA003Mapper.java index 49aab61..44c0a42 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA003Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA003Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA003; +import com.glxp.mipsdl.entity.hlfyyy.VA003; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA003Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA004Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA004Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java index 1de42cf..a41fc24 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA004Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA004; +import com.glxp.mipsdl.entity.hlfyyy.VA004; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA004Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA005Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA005Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA005Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA005Mapper.java index e2694d8..e6d1e91 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA005Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA005Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA005; +import com.glxp.mipsdl.entity.hlfyyy.VA005; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA005Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java index d465be9..92895c5 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA006; +import com.glxp.mipsdl.entity.hlfyyy.VA006; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA006Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006MxMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006MxMapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006MxMapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006MxMapper.java index 17a3088..338b272 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA006MxMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA006MxMapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA006Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA006Mx; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA006MxMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java new file mode 100644 index 0000000..e46e68e --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java @@ -0,0 +1,16 @@ +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.req.base.UdiwmsBasicSkPrescribeRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +@DS("hlfyyySql") +public interface VA010Mapper extends BaseMapper { + IPage getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010MxMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010MxMapper.java new file mode 100644 index 0000000..b2edcc8 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010MxMapper.java @@ -0,0 +1,11 @@ +package com.glxp.mipsdl.thirddao.hlfyyy; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.hlfyyy.VA010Mx; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +@DS("hlfyyySql") +public interface VA010MxMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011Mapper.java index 7b178a8..18a9316 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA011; +import com.glxp.mipsdl.entity.hlfyyy.VA011; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA011Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011MxMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011MxMapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011MxMapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011MxMapper.java index 258faec..6ff27b7 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA011MxMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA011MxMapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA011Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA011Mx; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA011MxMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015Mapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java index 5760680..4448682 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015Mapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA015; +import com.glxp.mipsdl.entity.hlfyyy.VA015; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA015Mapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015MxMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015MxMapper.java similarity index 51% rename from src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015MxMapper.java rename to src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015MxMapper.java index a2c9ebb..2bb3c56 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA015MxMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA015MxMapper.java @@ -1,9 +1,11 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; +package com.glxp.mipsdl.thirddao.hlfyyy; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA015Mx; +import com.glxp.mipsdl.entity.hlfyyy.VA015Mx; import org.apache.ibatis.annotations.Mapper; @Mapper +@DS("hlfyyySql") public interface VA015MxMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA010Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA010Mapper.java deleted file mode 100644 index 022d4c6..0000000 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlhyxyy/VA010Mapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.glxp.mipsdl.thirddao.hlhyxyy; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.mipsdl.entity.hlhyxyy.VA010; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface VA010Mapper extends BaseMapper { -} \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9de8256..e76588d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,7 +9,7 @@ spring: username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver - hlhyxyySql: + hlfyyySql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # username: SD_UDIJK # password: SD_UDIJK diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 5c928ee..d9743ba 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -9,7 +9,7 @@ spring: username: root password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver - hlhyxyySql: + hlfyyySql: driver-class-name: oracle.jdbc.driver.OracleDriver url: jdbc:oracle:thin:@192.168.158.251:1521/hlfy username: PZH diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA001Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml similarity index 91% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA001Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml index 816e67d..cfb0dde 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA001Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ UNITID, `NAME`, LASTUPDATETIME, ADDR, CREDITNO, SPELL, CONTACT, MOBILE - select * from a001 diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA002Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA002Mapper.xml similarity index 92% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA002Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA002Mapper.xml index 37e70bd..ad3255c 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA002Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA002Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -38,9 +38,9 @@ - LASTUPDATETIME, CODE, `NAME`, MEASNAME, `STANDARD`, REGISTERNO, MANUFACTORYCODE, - MANUFACTORY, SUPCODE, SUPNAME, CPLB, FLBM, QXLB, YBBM, SPTM, TYSHXYDM, YLQXZCRBARMC, - YLQXZCRBARYWMC, CPMS, SPMC, QTBM, ZCZYXQZ, PRICE, RETAILPRICE, INVCODE, REMARK, REMARK1, + LASTUPDATETIME, CODE, `NAME`, MEASNAME, `STANDARD`, REGISTERNO, MANUFACTORYCODE, + MANUFACTORY, SUPCODE, SUPNAME, CPLB, FLBM, QXLB, YBBM, SPTM, TYSHXYDM, YLQXZCRBARMC, + YLQXZCRBARYWMC, CPMS, SPMC, QTBM, ZCZYXQZ, PRICE, RETAILPRICE, INVCODE, REMARK, REMARK1, REMARK2, REMARK3, REMARK4, REMARK5 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA003Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA003Mapper.xml similarity index 91% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA003Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA003Mapper.xml index ddaeea2..a9efe07 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA003Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA003Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -37,9 +37,9 @@ - LASTUPDATETIME, CODE, `NAME`, NAMECODE, MEASNAME, BZGG, PACKUNIT, PREPNSPEC, PREPNUNIT, - ZXBZSL, REGISTERNO, MANUFACTORYCODE, MANUFACTORY, SUPCODE, SUPNAME, CPLB, FLBM, YBBM, - SPTM, TYSHXYDM, CPMS, SPMC, ZCZYXQZ, PRICE, RETAILPRICE, INVCODE, REMARK, REMARK1, + LASTUPDATETIME, CODE, `NAME`, NAMECODE, MEASNAME, BZGG, PACKUNIT, PREPNSPEC, PREPNUNIT, + ZXBZSL, REGISTERNO, MANUFACTORYCODE, MANUFACTORY, SUPCODE, SUPNAME, CPLB, FLBM, YBBM, + SPTM, TYSHXYDM, CPMS, SPMC, ZCZYXQZ, PRICE, RETAILPRICE, INVCODE, REMARK, REMARK1, REMARK2, REMARK3 - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA004Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml similarity index 76% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA004Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml index 364ac99..bb3aac9 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA004Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -12,4 +12,4 @@ CODE, `NAME`, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA005Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA005Mapper.xml similarity index 79% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA005Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA005Mapper.xml index 7a200ea..311c3df 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA005Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA005Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,4 +13,4 @@ CODE, `NAME`, INOUTTYPE, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA006Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml similarity index 85% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA006Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml index 3761018..807d136 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA006Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, + CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA006MxMapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006MxMapper.xml similarity index 88% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA006MxMapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA006MxMapper.xml index 6062375..dea9a2b 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA006MxMapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA006MxMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -21,7 +21,7 @@ - CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, + CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, GGXH, `COUNT`, PRICE, RETAILPRICE, AMOUNT, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml new file mode 100644 index 0000000..a8fdf07 --- /dev/null +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, + REMARK + + + diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010MxMapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010MxMapper.xml new file mode 100644 index 0000000..adbd98a --- /dev/null +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010MxMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, + `COUNT`, BZGG, PACKUNIT, PREPNSPEC, PREPNUNIT, MEASNAME, PRICE, RETAILPRICE, AMOUNT, + REMARK, DRUGLIST + + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA011Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml similarity index 87% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA011Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml index c42b21d..a8d8b79 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA011Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -20,7 +20,7 @@ - CODEFK, CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, + CODEFK, CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, INVCODE, SETTLENO, DIAGNOSIS, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA011MxMapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011MxMapper.xml similarity index 89% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA011MxMapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA011MxMapper.xml index 73689c9..84a7066 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA011MxMapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011MxMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -26,8 +26,8 @@ - CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, - `COUNT`, BZGG, PACKUNIT, PREPNSPEC, PREPNUNIT, MEASNAME, PRICE, RETAILPRICE, AMOUNT, + CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, + `COUNT`, BZGG, PACKUNIT, PREPNSPEC, PREPNUNIT, MEASNAME, PRICE, RETAILPRICE, AMOUNT, REMARK, DRUGLIST - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA015Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml similarity index 85% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA015Mapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml index db8b303..3d106de 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA015Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015Mapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, + CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA015MxMapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015MxMapper.xml similarity index 88% rename from src/main/resources/mybatis/mapper/master/hlhyxyy/VA015MxMapper.xml rename to src/main/resources/mybatis/mapper/master/hlfyyy/VA015MxMapper.xml index 2a54c50..99d32aa 100644 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA015MxMapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA015MxMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -21,7 +21,7 @@ - CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, + CODEFK, THRID, ITEMNAME, ITEMCODE, MEASURECOUNT, MEASUREUNIT, CATEGORY, FREQUENCY, GGXH, `COUNT`, PRICE, RETAILPRICE, AMOUNT, REMARK - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlhyxyy/VA010Mapper.xml deleted file mode 100644 index 7f966bd..0000000 --- a/src/main/resources/mybatis/mapper/master/hlhyxyy/VA010Mapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, - REMARK - - \ No newline at end of file