Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r40612 -r40778 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 40612) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 40778) @@ -1096,6 +1096,7 @@ public void setUrgentInfo() { if(CollectionUtils.isNotEmpty(applicationItems)){ int urgentAmount = 0; + UrgentLevel maxUrgentLevel = null; for (TousseItem tousseItem : applicationItems) { UrgentLevel urgentLevelOfRecyclingApplication = getUrgentLevel(); UrgentLevel urgentLevelOfTousseItem = tousseItem.getUrgentLevelObj(); @@ -1107,19 +1108,26 @@ if(gradeOfTousseItem != null){ if(gradeOfRecyclingApplication != null){ if(gradeOfTousseItem.intValue() > gradeOfRecyclingApplication.intValue()){ - setUrgentLevel(urgentLevelOfTousseItem); + maxUrgentLevel = urgentLevelOfTousseItem; } }else{ - setUrgentLevel(urgentLevelOfTousseItem); + maxUrgentLevel = urgentLevelOfTousseItem; } } }else{ - setUrgentLevel(urgentLevelOfTousseItem); + maxUrgentLevel = urgentLevelOfTousseItem; } } } - setUrgentAmount(urgentAmount); - setUrgent(getUrgentLevel() == null ? com.forgon.Constants.STR_NO : com.forgon.Constants.STR_YES); + if(maxUrgentLevel == null){ + setUrgentAmount(0); + setUrgent(com.forgon.Constants.STR_NO); + setUrgentLevel(null); + }else{ + setUrgentAmount(urgentAmount); + setUrgent(com.forgon.Constants.STR_YES); + setUrgentLevel(maxUrgentLevel); + } } }