Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r15149 -r15163 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 15149) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 15163) @@ -63,6 +63,7 @@ import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager; import com.forgon.disinfectsystem.idcardinstance.util.IDCardInstanceUtils; @@ -244,9 +245,8 @@ if (barcodeDevice instanceof TousseInstance) { tousseInstance = (TousseInstance) barcodeDevice; isTousseInstanceBarcode = true; - } // 是否器械包标识牌实例 - else if (barcodeDevice instanceof IDCardInstance) { + }else if (barcodeDevice instanceof IDCardInstance) { isIdCardBarcode = true; IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice; List tousseInstances = idCardInstance @@ -272,33 +272,42 @@ .equals(status)) { tousseInstance = firstTousseInstance; } - - } - else{ + }else{ message = "该标识牌没有器械包装配记录!(即没有关联的器械包实例)"; } - - } // 是否部门编码 - else if(barcodeDevice.getType()!=null && BarcodeDevice.BARCODE_TYPE_ORGUNIT.equals(barcodeDevice.getType())){ + }else if(barcodeDevice.getType()!=null && BarcodeDevice.BARCODE_TYPE_ORGUNIT.equals(barcodeDevice.getType())){ OrgUnit orgUnit = orgUnitManager.getOrgUnitByBarcode(barcodeStr); orgUnitCoding = orgUnit.getOrgUnitCoding(); departMent = orgUnit.getName(); } - if(tousseInstance != null){ id = recyclingApplicationManager.getWaitingRecycleApplicationIdContaintTousseInstance(tousseInstance.getBarcode()); if (StringUtils.isBlank(id)){ - message = "没有找到该条码所对应的待回收申请单"; - } - else{ + //获取提示信息 + if(tousseInstance.getUseRecord_id() != null){ + UseRecord useRecord = (UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", tousseInstance.getUseRecord_id()); + if(useRecord != null && StringUtils.isNotBlank(useRecord.getStatus())){ + switch(useRecord.getStatus()){ + case UseRecord.STATUS_UNAUDITED: + message = "该器械包的使用记录未审核,请审核后再回收"; + break; + case UseRecord.STATUS_AUDITED: + message = "该器械包的使用记录未转换申请单,请转换后再回收"; + break; + default: + message = "该器械包已回收!"; + break; + } + } + } + }else{ message = ""; } } - } JSONObject jsonObject = new JSONObject(); jsonObject.put("success", true);