Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java =================================================================== diff -u -r31935 -r31946 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 31935) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 31946) @@ -308,9 +308,7 @@ //setUseRecordItemsFromParams(modified, items, tousseInstanceMaterialErrorDamageItems); UseRecordUtil.setUseRecordItemsFromParams(modified, items, tousseInstanceMaterialErrorDamageItems, tousseInstanceManager,barcodeManager,objectDao,true,supplyRoomConfigManager); - boolean enableUseRecordTransportToThirdPartySystem = - ConfigUtils.getSystemSetConfigByNameBool("enableUseRecordTransportToThirdPartySystem"); - useRecordManager.saveUseRecord_TRANS_REQUIRED(modified, enableUseRecordTransportToThirdPartySystem); + useRecordManager.saveUseRecord_TRANS_REQUIRED(modified); } JSONUtil.addSuccess(json, true); } catch (RuntimeException e) { Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r31944 -r31946 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 31944) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 31946) @@ -894,6 +894,8 @@ objectDao.saveOrUpdate(useRecord); // 已经放入库位的器械包需要取出 updateStorageRecordByUserRecord(useRecord); + // 向第三方平台推送使用记录XMSFYBJY-7 + this.pushUseRecord(useRecord); } /** @@ -2148,12 +2150,12 @@ //重新计算该使用记录的所有高值耗材实例所关联申请单的haveUseRecord属性的值 recyclingApplicationManager.calculateInvoicePlanHaveUseRecordByInvoicePlanIdList(invoicePlanIdList); - if(CollectionUtils.isNotEmpty(newTousseInstanceIDs) || CollectionUtils.isNotEmpty(deletedTousseInstanceIDs) + /*if(CollectionUtils.isNotEmpty(newTousseInstanceIDs) || CollectionUtils.isNotEmpty(deletedTousseInstanceIDs) || CollectionUtils.isNotEmpty(modifyContent) || StringUtils.equals(curUseRecord.getFinishPush(), Constants.STR_NO)){ // 新增或者删除了使用记录登记的器械包或者修改了使用记录其它属性的值或者使用记录还没有推送成功,才给第三方平台推送使用记录 this.pushUseRecord(curUseRecord); - } + }*/ }