Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r34840 -r34871 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34840) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34871) @@ -3453,6 +3453,10 @@ String.format("【%s】的【%s】录入使用记录转换申请单后,单号为【%s】的原外来器械包申请单的回收状态设置为已回收.", tousseInstance.getBarcode() , tousseInstance.getTousseName() , foreignTousseApplication.getSerialNumber())); } + if(tousseItem != null && StringUtils.equals(tousseItem.getPackageStatus(), TousseInstance.STATUS_USED)){ + //转换申请单后不做二次回收时,外来器械包包状态由“已使用”转换为“待归还”HBTSGRYY-11 + tousseItem.setPackageStatus(ForeignTousseApplication.APPLICATION_STATUS_TOBERETURNED); + } }else{ String foreignTousseBarcode = foreignTousseApplication.getTousseBarcodes(); if(StringUtils.isBlank(foreignTousseBarcode)){ @@ -3467,13 +3471,13 @@ foreignTousseApplication.setSubmitTime(new Date()); foreignTousseApplication.setUseRecord(useRecord); ForeignTousseApplication.setUseRecordInfo(foreignTousseApplication); + if(tousseItem != null && StringUtils.equals(tousseItem.getPackageStatus(), TousseInstance.STATUS_USED)){ + //转换申请单时,外来器械包包状态由“已使用”转换为“待二次回收”HBTSGRYY-11 + tousseItem.setPackageStatus(InvoicePlan.RECYCLINGSTATUS_AWAIT_SECOND_RECEIVE); + } } objectDao.saveOrUpdate(foreignTousseApplication); } - if(tousseItem != null && StringUtils.equals(tousseItem.getPackageStatus(), TousseInstance.STATUS_USED)){ - //转换申请单时,外来器械包包状态由“已使用”转换为“待二次回收”HBTSGRYY-11 - tousseItem.setPackageStatus(InvoicePlan.RECYCLINGSTATUS_AWAIT_SECOND_RECEIVE); - } if(tousseItem != null){ UrgentLevel urgentLevelForUseRecord = tousseInstance.getUrgentLevelForUseRecord(); if(urgentLevelForUseRecord != null){