Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r31698 -r33470 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 31698) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 33470) @@ -117,7 +117,9 @@ */ public static String getBeforeRecycleTousseStatus(TousseInstance tousseInstance){ if(tousseInstance != null){ - if(tousseInstance.getTousseTransitionItemId() != null){ + if(StringUtils.isNotBlank(tousseInstance.getWasteReason())){ + return TousseInstance.STATUS_DISCARD; + }else if(tousseInstance.getTousseTransitionItemId() != null){ //有器械交接项id,说明做过器械交接,那就是预回收状态 return TousseInstance.STATUS_PRERECYCLED; }else if(tousseInstance.getUseRecord_id() != null){