diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 77af2fbe..1f93d55c 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -128,7 +128,6 @@ public class UdiRelevanceController extends BaseController { } - //基础信息-耗材字典-查询页面、业务单据-选入耗材字典-查询页面 @AuthRuleAnnotation("") @GetMapping("/udi/udirel/filterUdi") @@ -245,6 +244,18 @@ public class UdiRelevanceController extends BaseController { tempRequest.setNameCode(filterUdiRelRequest.getNameCode()); } List udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest); + + //移除层级为空的数据 + if (CollUtil.isNotEmpty(udiInfoEntities) && udiInfoEntities.size() > 1) { + for (int i = 0; i < udiInfoEntities.size(); i++) { + if (StrUtil.isEmpty(udiInfoEntities.get(i).getNameCode())) { + udiProductService.deleteById(udiInfoEntities.get(i).getId() + ""); + udiInfoEntities.remove(i); + break; + } + } + } + List udiRelevanceResponses = new ArrayList<>(); if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiProductEntity udiProductEntity : udiInfoEntities) { @@ -400,9 +411,9 @@ public class UdiRelevanceController extends BaseController { try { CodeRel codeRel = new CodeRel(); - if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){ + if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1) { codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode()); - }else { + } else { codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode()); } codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm()); @@ -410,8 +421,8 @@ public class UdiRelevanceController extends BaseController { codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm()); codeRel.setUpdateTime(new Date()); erpBasicClient.updateCodeRelDetail(codeRel); - }catch (Exception e){ - System.out.println("上传多码融合:"+e); + } catch (Exception e) { + System.out.println("上传多码融合:" + e); } return ResultVOUtils.success("更新成功"); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index 0db55abe..35fd93c2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -54,6 +54,13 @@ public class ThirdAliDrugController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + + if (StrUtil.isEmpty(thirdAliDrug.getApprovalNum()) && StrUtil.isEmpty(thirdAliDrug.getNameCode()) && + StrUtil.isEmpty(thirdAliDrug.getCpmctymc()) + ) { + return ResultVOUtils.success("查询参数不能为空"); + } List list = thirdAliDrugService.filterList(thirdAliDrug); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -65,7 +72,7 @@ public class ThirdAliDrugController extends BaseController { @GetMapping("/udiwms/aliDrug/getDrugLevelListBycode") public BaseResponse getDrugLevelListBycode(ThirdAliDrugRequest thirdAliDrug, BindingResult bindingResult) { String nameCode = thirdAliDrug.getNameCode(); - if (StrUtil.isEmpty(nameCode)){ + if (StrUtil.isEmpty(nameCode)) { return ResultVOUtils.error("标识参数不能为空"); } ThirdAliDrug one = thirdAliDrugService.getOne(new LambdaQueryWrapper().eq(ThirdAliDrug::getNameCode, nameCode)); @@ -74,8 +81,10 @@ public class ThirdAliDrugController extends BaseController { } List list = thirdAliDrugService.list(new LambdaQueryWrapper() + .eq(ThirdAliDrug::getApprovalNum, one.getApprovalNum()) + .eq(ThirdAliDrug::getCpmctymc, one.getCpmctymc()) .eq(ThirdAliDrug::getForm, one.getForm()) - .eq(ThirdAliDrug::getFormSpec, one.getFormSpec()) + .eq(ThirdAliDrug::getBzgg, one.getBzgg()) .eq(ThirdAliDrug::getPackRatio, one.getPackRatio())); return ResultVOUtils.success(list); diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index a035417a..a2edf545 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -7,10 +7,7 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; -import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; -import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.entity.thrsys.YbDrug; +import com.glxp.api.entity.thrsys.*; import com.glxp.api.exception.JsonException; import com.glxp.api.http.NmpaUdiClient; import com.glxp.api.req.basic.UdiCombineRequest; @@ -21,12 +18,10 @@ import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest; import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.thrsys.BasicInsMaterialService; +import com.glxp.api.service.thrsys.ThirdAliDrugService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.YbDrugService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.IntUtil; +import com.glxp.api.util.*; import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -205,6 +200,8 @@ public class UdiContrastService { .orElse(null); } + @Resource + ThirdAliDrugService thirdAliDrugService; public void createOnlyMainId(String mainId) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); @@ -233,18 +230,20 @@ public class UdiContrastService { ybHcflDetailFilterRequest.setPage(1); ybHcflDetailFilterRequest.setGoodsCode(thrProductsEntity.getYbbm()); List list = ybDrugService.getList(ybHcflDetailFilterRequest); + + UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); - udiProductEntity.setId(IdUtil.getSnowflakeNextId()); - if (list != null && list.size() > 0){ + if (list != null && list.size() > 0) { YbDrug ybDrug = list.get(0); + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); // udiProductEntity.setNameCode(thrProductsEntity.getCode()); udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook()); udiProductEntity.setZczbhhzbapzbh(ybDrug.getApprovalCode()); udiProductEntity.setCpmctymc(ybDrug.getRegisteredProductName()); udiProductEntity.setSpmc(ybDrug.getGoodsName()); - udiProductEntity.setBzgg(String.valueOf(ybDrug.getFactor())+ ybDrug.getMinUnit() + "/" + ybDrug.getUnit()); + udiProductEntity.setBzgg(String.valueOf(ybDrug.getFactor()) + ybDrug.getMinUnit() + "/" + ybDrug.getUnit()); udiProductEntity.setMatrial(ybDrug.getMaterialName()); udiProductEntity.setPackMatrial(ybDrug.getMaterialName()); udiProductEntity.setMedicareType(setMedicareType(ybDrug.getProductInsuranceType())); @@ -259,28 +258,46 @@ public class UdiContrastService { //商品条码 essentialDrugMarkName sptm // udiProductEntity.setSptm(ybDrug.getBusinessLicense()); udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel()); + udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); + udiProductEntity.setDiType(1); + udiProductEntity.setScbssfbhph("是"); + udiProductEntity.setScbssfbhscrq("是"); + udiProductEntity.setScbssfbhsxrq("是"); + udiProductEntity.setScbssfbhxlh("否"); + udiProductEntity.setProductsType(thrProductsEntity.getProductType()); + udiProductEntity.setRequireScanCode(1); + udiProductEntity.setMajorStatus(1); + udiProductEntity.setPhysicType(3); + if (StrUtil.isEmpty(udiProductEntity.getPrice())) { + udiProductEntity.setPrice("0.00"); + } + udiProductEntity.setUpdateTime(new Date()); + udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); + List thirdAliDrugList = thirdAliDrugService.findByByApproved(ybDrug.getApprovalCode()); + if (CollUtil.isNotEmpty(thirdAliDrugList)) { + for (int i = 0; i < thirdAliDrugList.size(); i++) { + ThirdAliDrug thirdAliDrug = thirdAliDrugList.get(i); + List integers = DimaUtil.calculateLevels(thirdAliDrug.getPackRatio()); + udiProductEntity.setPackLevel(thirdAliDrug.getPackLevel()); + udiProductEntity.setBhxjsl(integers.get(IntUtil.value(thirdAliDrug.getPackLevel()) - 1)); + udiProductEntity.setNameCode(thirdAliDrug.getNameCode()); + if (IntUtil.value(thirdAliDrug.getPackLevel()) == 1) { + udiProductEntity.setXjdw(ybDrug.getMinUnit()); + udiProductEntity.setBhxjsl(ybDrug.getFactor()); + } + udiProductEntity.setDiType(IntUtil.value(thirdAliDrug.getPackLevel()) == 1 ? 1 : 4); + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); + udiProductService.insertUdiInfo(udiProductEntity); + } + } else { + udiProductService.insertUdiInfo(udiProductEntity); + } } - - udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); - udiProductEntity.setDiType(1); - udiProductEntity.setScbssfbhph("是"); - udiProductEntity.setScbssfbhscrq("是"); - udiProductEntity.setScbssfbhsxrq("是"); - udiProductEntity.setScbssfbhxlh("否"); - udiProductEntity.setProductsType(thrProductsEntity.getProductType()); - udiProductEntity.setRequireScanCode(1); - udiProductEntity.setMajorStatus(1); - udiProductEntity.setPhysicType(3); - if (StrUtil.isEmpty(udiProductEntity.getPrice())) { - udiProductEntity.setPrice("0.00"); - } - udiProductEntity.setUpdateTime(new Date()); - udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); - udiProductService.insertUdiInfo(udiProductEntity); // setLevel(udiRelevanceEntity.getUuid()); UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, byUuid); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + udiProductService.updateLevelCount(udiRelevanceEntity); } else { //器械 ThrInsMaterialFeeRequest request = new ThrInsMaterialFeeRequest(); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 24ae56c8..37341bfa 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -172,7 +172,7 @@ public class UdiProductServiceImpl implements UdiProductService { @Override public boolean insertUdiInfos(List udiInfoEntities) { - return udiProductDao.insertUdiInfos(udiInfoEntities); + return udiProductDao.replaceBatchs(udiInfoEntities); } @Override diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index c2c1cc09..7a520182 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -501,51 +501,73 @@ public class RelCodeBatchService extends ServiceImpl> sortedCodeMap = codeMap.entrySet() + .stream() + .sorted(Comparator.comparing( + e -> Optional.ofNullable(e.getValue().isEmpty() ? null : e.getValue().get(0)) + .map(RelCodeDetail::getPackLayer) + .orElse(Integer.MIN_VALUE), // Default to Integer.MIN_VALUE if the list is empty (shouldn't happen normally) + Comparator.reverseOrder() + )) + .collect(Collectors.toMap( + Map.Entry::getKey, + Map.Entry::getValue, + (e1, e2) -> e1, // Merge function in case of duplicate keys (shouldn't happen with a well-formed Map) + LinkedHashMap::new // Preserve insertion order, though not strictly necessary for sorting + )); + Map batchIdFkMap = new HashMap<>(); List addRelCodeDetail = new ArrayList<>(); - RelCodeBatch updateDrugLevelRelCodeBatch = null; + List updateDrugLevelRelCodeBatch = new ArrayList<>(); // 遍历 Map - for (Map.Entry> entry : codeMap.entrySet()) { + for (Map.Entry> entry : sortedCodeMap.entrySet()) { String key = entry.getKey(); List list = entry.getValue(); - RelCodeBatch addRelCodeBatch = new RelCodeBatch(); - BeanUtils.copyProperties(relCodeBatch,addRelCodeBatch); - addRelCodeBatch.setParentCode(key); if ("0".equals(key)){ - RelCodeDetail relCodeDetail = list.get(0); - String curCode = relCodeDetail.getCurCode(); - String diStr = FilterUdiUtils.getUdi(curCode).getUdi(); - addRelCodeBatch.setProductCode(diStr); - addRelCodeBatch.setCurCode(curCode); - addRelCodeBatch.setThreeLevelCount(1); - - this.save(addRelCodeBatch); - batchIdFkMap.put(curCode,addRelCodeBatch.getId()); - updateDrugLevelRelCodeBatch = addRelCodeBatch; + for (RelCodeDetail relCodeDetail : list) { + RelCodeBatch addRelCodeBatch = new RelCodeBatch(); + BeanUtils.copyProperties(relCodeBatch,addRelCodeBatch); + addRelCodeBatch.setParentCode(key); + String curCode = relCodeDetail.getCurCode(); + String diStr = FilterUdiUtils.getUdi(curCode).getUdi(); + addRelCodeBatch.setProductCode(diStr); + addRelCodeBatch.setCurCode(curCode); + addRelCodeBatch.setThreeLevelCount(1); + addRelCodeBatch.setId(null); + + this.save(addRelCodeBatch); + batchIdFkMap.put(curCode,addRelCodeBatch.getId()); + updateDrugLevelRelCodeBatch.add(addRelCodeBatch); + } + }else { for (RelCodeDetail detail : list) { Integer packLayer = detail.getPackLayer(); if (packLayer == 2){ RelCodeBatch addRelCodeBatch2 = new RelCodeBatch(); BeanUtils.copyProperties(relCodeBatch,addRelCodeBatch2); - addRelCodeBatch2.setParentCode(key); String curCode = detail.getCurCode(); + String parentCode = detail.getParentCode(); + addRelCodeBatch2.setParentCode(parentCode); String diStr = FilterUdiUtils.getUdi(curCode).getUdi(); addRelCodeBatch2.setProductCode(diStr); addRelCodeBatch2.setCurCode(curCode); addRelCodeBatch2.setThreeLevelCount(0); addRelCodeBatch2.setTwoLevelCount(1); + addRelCodeBatch2.setId(null); this.save(addRelCodeBatch2); batchIdFkMap.put(curCode,addRelCodeBatch2.getId()); //同时也是上面的明细 - detail.setBatchIdFk(batchIdFkMap.get(key)); + detail.setBatchIdFk(batchIdFkMap.get(parentCode)); addRelCodeDetail.add(detail); }else if (packLayer == 1){ //直接明细 - detail.setBatchIdFk(batchIdFkMap.get(key)); + String parentCode = detail.getParentCode(); + detail.setBatchIdFk(batchIdFkMap.get(parentCode)); addRelCodeDetail.add(detail); } } @@ -554,7 +576,9 @@ public class RelCodeBatchService extends ServiceImpl { + this.updateDrugLevelCount(item); + }); } } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java index f01ddbd3..76e6a784 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.exception.JsonException; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; @@ -238,4 +239,9 @@ public class ThirdAliDrugService extends ServiceImpl findByByApproved(String approvalNum) { + return this.baseMapper.selectList(new LambdaQueryWrapper().eq(ThirdAliDrug::getApprovalNum, approvalNum)); + } } diff --git a/src/main/java/com/glxp/api/util/DimaUtil.java b/src/main/java/com/glxp/api/util/DimaUtil.java new file mode 100644 index 00000000..9faa6d3f --- /dev/null +++ b/src/main/java/com/glxp/api/util/DimaUtil.java @@ -0,0 +1,37 @@ +package com.glxp.api.util; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author AnthonyYwj + * @date 2024/11/12 + */ +public class DimaUtil { + public static List calculateLevels(String ratio) { + // 分割比例字符串并转成整数数组 + String[] parts = ratio.split(":"); + int[] levels = new int[parts.length]; + + for (int i = 0; i < parts.length; i++) { + levels[i] = Integer.parseInt(parts[i]); + } + + // 存储每层级的倍数关系 + List calculatedLevels = new ArrayList<>(); + for (int i = levels.length - 1; i > 0; i--) { + calculatedLevels.add(levels[i] / levels[i - 1]); + } + + // 最后加上最小单位（第一层级为 1） + calculatedLevels.add(1); + + // 结果倒序 + List reversed = new ArrayList<>(); + for (int i = calculatedLevels.size() - 1; i >= 0; i--) { + reversed.add(calculatedLevels.get(i)); + } + + return reversed; + } +} diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 6d2a34e0..3e1ef7c2 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -95,10 +95,10 @@ basic_products.cphhhbh, basic_products.hchzsb FROM (company_product_relevance - inner JOIN basic_udirel - ON company_product_relevance.udiRlIdFk = basic_udirel.id) - inner JOIN basic_products - ON basic_udirel.uuid = basic_products.uuid + inner JOIN basic_udirel + ON company_product_relevance.udiRlIdFk = basic_udirel.id) + inner JOIN basic_products + ON basic_udirel.uuid = basic_products.uuid AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') @@ -175,7 +175,7 @@ resultType="com.glxp.api.entity.basic.UdiProductEntity"> SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType FROM basic_products - LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid + LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid WHERE (basic_products.nameCode = #{nameCode}) limit 1 @@ -201,8 +201,9 @@ catalogname3, matrial, destinyType, - productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, - requireScanCode,detailSort) + productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType, + majorStatus, physicType, medicareType, bzgg, xjdw, + requireScanCode) values (#{id}, #{uuid}, #{originUuid}, #{nameCode}, @@ -275,84 +276,80 @@ #{majorStatus}, #{physicType}, #{medicareType}, - #{bzgg}, - #{requireScanCode}, - #{detailSort} - - - ) + #{bzgg}, #{xjdw}, + #{requireScanCode}) replace INTO basic_products (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, - mjfs, categoryName, pinyinInitial) + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, + mjfs, categoryName, pinyinInitial, xjdw) values (#{item.id}, - #{item.uuid}, - #{item.originUuid}, - #{item.nameCode}, - #{item.deviceRecordKey}, - #{item.packRatio}, - #{item.packLevel}, - #{item.packUnit}, - #{item.bhxjsl}, - #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, - #{item.bhxjcpbm}, - #{item.bzcj}, - #{item.cpmctymc}, - #{item.cplb}, - #{item.flbm}, - #{item.ggxh}, - #{item.qxlb}, - #{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarywmc}, - #{item.sydycpbs}, - #{item.sjcpbm}, - #{item.versionNumber}, - #{item.diType}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.productType}, - #{item.scbssfbhph}, - #{item.scbssfbhxlh}, - #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq}, - #{item.cpms}, - #{item.allowNoBatch}, - #{item.allowNoExpire}, - #{item.allowNoProduct}, #{item.allowNoSerial}, - #{item.spmc}, - #{item.cplx}, - #{item.hchzsb}, - #{item.cpdls}, - #{item.price}, - #{item.basicPrductRemak1}, - #{item.basicPrductRemak2}, - #{item.basicPrductRemak3}, - #{item.basicPrductRemak4}, - #{item.basicPrductRemak5}, - #{item.basicPrductRemak6}, - #{item.basicPrductRemak7}, - #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy}, - #{item.zdcfsycs}, - #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs}, - #{item.categoryName}, #{item.pinyinInitial}) + #{item.uuid}, + #{item.originUuid}, + #{item.nameCode}, + #{item.deviceRecordKey}, + #{item.packRatio}, + #{item.packLevel}, + #{item.packUnit}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.sydycpbs}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.productType}, + #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq}, + #{item.cpms}, + #{item.allowNoBatch}, + #{item.allowNoExpire}, + #{item.allowNoProduct}, #{item.allowNoSerial}, + #{item.spmc}, + #{item.cplx}, + #{item.hchzsb}, + #{item.cpdls}, + #{item.price}, + #{item.basicPrductRemak1}, + #{item.basicPrductRemak2}, + #{item.basicPrductRemak3}, + #{item.basicPrductRemak4}, + #{item.basicPrductRemak5}, + #{item.basicPrductRemak6}, + #{item.basicPrductRemak7}, + #{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy}, + #{item.zdcfsycs}, + #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs}, + #{item.categoryName}, #{item.pinyinInitial}, #{item.xjdw}) @@ -1010,7 +1007,6 @@ matrial=#{matrial}, - where id = #{id} @@ -1042,7 +1038,7 @@ @@ -1231,9 +1227,6 @@ price=#{price}, - - detailSort=#{detailSort}, - WHERE uuid = #{uuid} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml index f6fa38f4..8ffd69bb 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml @@ -38,53 +38,53 @@ replace INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio, - packLevel, createTime, updateTime, erpId, approvalNum) + packLevel, createTime, updateTime, erpId, approvalNum) VALUES (#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg}, - #{item.spmc}, #{item.nameCode}, - #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId}, - #{item.approvalNum}) + #{item.spmc}, #{item.nameCode}, + #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId}, + #{item.approvalNum}) - - - +