From 13ac0d742f36d149e9264a3168ba8f4660fd875f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 6 Mar 2024 14:29:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E8=80=97=EF=BC=8C=E6=94=B6=E8=B4=B9?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=9F=E6=88=90=E5=8D=95=E6=8D=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrInvOrderController.java | 2 + .../api/req/thrsys/GenerateOrderRequest.java | 2 +- .../thrsys/impl/ThrInvOrderServiceImpl.java | 9 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 245 +++++++++--------- 4 files changed, 130 insertions(+), 128 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java index 246c77120..d7fa628ea 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -97,6 +97,7 @@ public class ThrInvOrderController { /** * 普耗与收费单据生成 + * * @param generateOrderRequest * @param bindingResult * @return @@ -115,6 +116,7 @@ public class ThrInvOrderController { /** * 高值耗材单据生成 + * * @param generateOrderRequest * @param bindingResult * @return diff --git a/src/main/java/com/glxp/api/req/thrsys/GenerateOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/GenerateOrderRequest.java index 40d24ffa9..b077c0d8a 100644 --- a/src/main/java/com/glxp/api/req/thrsys/GenerateOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/GenerateOrderRequest.java @@ -22,7 +22,7 @@ public class GenerateOrderRequest { /** * 往来单位 */ - @NotEmpty(message = "往来单位不能为空！") +// @NotEmpty(message = "往来单位不能为空！") private String fromCorp; } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 9822ed8d2..c34c425c9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -335,12 +335,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { //校验单据的relId有null不生成单据 if (!inspectionDocuments(thrInvOrderDetails)) return false; - //todo 如果是患者收费明细需要根据患者进行分组拆单而且往来单位为患者信息 - - BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(generateOrderRequest.getAction()); - List fromCorpList = new ArrayList<>(); Map> grouped = new HashMap<>(); //往来类型为患者，则需要根据患者进行拆单 if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { @@ -370,7 +366,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { Long userId = customerService.getUserId(); ioOrderEntity.setCreateUser(userId + ""); ioOrderEntity.setUpdateUser(userId + ""); - ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);//正常单据处理 + ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);//正常单据处理 List newOrderDetailBiz = new ArrayList<>(grouped.values().size()); if (!copyOrderDetailBiz(entry.getValue(), newOrderDetailBiz, newBillNo)) { @@ -490,7 +486,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { StringBuilder exmsg = new StringBuilder(""); Integer skProject = thrInvOrder.getSkProject(); - if (skProject == 1) {//走组套 + if (thrInvOrder.getSourceType() == Constant.THR_INV_SF_ORDER_TYPE) {//走组套 thrInvOrderDetails.forEach(item -> { Long relId = item.getRelId(); if (ObjectUtil.isNull(relId)) { @@ -721,6 +717,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { ioOrderDetailBizEntity.setId(IdUtil.getSnowflakeNextId()); ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); ioOrderDetailBizEntity.setBindRlFk(basicProductsEntity.getId()); + ioOrderDetailBizEntity.setSupId(thrInvOrderDetail.getSupId()); ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); ioOrderDetailBizEntity.setCount(Integer.valueOf(thrInvOrderDetail.getReCount())); ioOrderDetailBizEntity.setBatchNo(thrInvOrderDetail.getBatchNo()); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 3b0854ef6..8178b09e3 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1225,70 +1225,72 @@ replace - INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + INTO basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence},#{purType},#{attributeType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence},#{purType},#{attributeType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) insert - ignore + ignore INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence},#{purType},#{attributeType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence},#{purType},#{attributeType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) @@ -1438,7 +1440,8 @@ into basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, + lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) values @@ -1811,6 +1814,7 @@ - select bu.id, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.categoryName - from basic_udirel AS bu - LEFT JOIN basic_products - ON bu.uuid = basic_products.uuid - where basic_products.nameCode = #{nameCode} + select bu.id, + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.categoryName + from basic_udirel AS bu + LEFT JOIN basic_products + ON bu.uuid = basic_products.uuid + where basic_products.nameCode = #{nameCode} -