普耗，收费出库生成单据优化

1 year ago · 13ac0d742f
parent e685fb17dc
commit 13ac0d742f
4 changed files with 130 additions and 128 deletions
--- 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
--- 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;

 }
--- 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<String> fromCorpList = new ArrayList<>();
        Map<String, List<ThrInvOrderDetail>> 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<IoOrderDetailBizEntity> 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());
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@ -1225,70 +1225,72 @@

    <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
        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>

    <insert id="insertUdiRelevanceignore"
            parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
        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})
    </insert>

    <delete id="deleteById" parameterType="Map">
@ -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 id="selectProductByRelIds" resultType="com.glxp.api.entity.basic.BasicProductsEntity">
        select bu.id,
+        basic_products.uuid,
        basic_products.originUuid,
        basic_products.nameCode,
        basic_products.deviceRecordKey,
@ -1880,69 +1884,68 @@


    <select id="getProductsEntitiesByNameCode" resultType="com.glxp.api.entity.basic.BasicProductsEntity">
-    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}
    </select>
-
 </mapper>