Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r24834 -r24973 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24834) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24973) @@ -1794,7 +1794,7 @@ public void voluntarilyUrgent(String department, List tousseItemJson, List urgentTousseItems, JSONObject params) { //先把tousseItemJson里面的启用标识牌的器械包合并 - Collection tousseItemJsonTemp = mergeIdCardTousse(tousseItemJson); + Collection tousseItemJsonTemp = mergeIdCardTousse(tousseItemJson); JSONArray voluntarilyUrgentItems = new JSONArray(); if (CollectionUtils.isNotEmpty(tousseItemJsonTemp)) { for (RecyclingBasketItemVo json : tousseItemJsonTemp) { @@ -1827,7 +1827,8 @@ }finally { DatabaseUtil.closeResultSetAndStatement(result); } - int voluntarilyUrgentAmount = amount2 - urgentWarningValue; + //针对ZSSXLRMYY-179的问题进行修改(要多出一个加急、考虑到只有一个包的基数时哪怕只申请一个也要加急的情况) + int voluntarilyUrgentAmount = amount2 + 1 - urgentWarningValue; if (voluntarilyUrgentAmount > 0) { if(urgentTousseItems != null){ for (int i = 0; i < urgentTousseItems.size(); i++) { Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r24833 -r24973 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 24833) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 24973) @@ -3110,16 +3110,21 @@ TousseDefinition tousseDefinition = tousseDefinitionIdToTousseDefinitionMap.get(tousseDefinitionId); if (tousseDefinition != null && tousseDefinition.getUrgentWarningValue() != null && tousseDefinition.getUrgentWarningValue() > 0) { - Integer amount = tousseDefinitionIdToAmount.get(tousseDefinitionId); //库存数量 - Integer urgentAmount = amount - tousseDefinition.getUrgentWarningValue(); //应该的加急数量 + //处于供应室的库存数量 + Integer amount = tousseDefinitionIdToAmount.get(tousseDefinitionId); + //应该加急的数量:供应室库存数量-包定义的加急预警值 + Integer urgentAmount = amount - tousseDefinition.getUrgentWarningValue(); + //合计已经加急的器械包 Integer actualUrgentAmount = tousseDefinitionIdToUrgentAmount.get(tousseDefinitionId); //实际加急数量 - Integer deviation = 0; //误差 + Integer deviation = 0; //误差(已经加急的包数量-当前应该加急的包数量) if (urgentAmount > 0) { deviation = actualUrgentAmount - urgentAmount; } else { deviation = actualUrgentAmount; } + //针对ZSSXLRMYY-179的问题进行修改(要多出一个加急、考虑到只有一个包的基数时哪怕只申请一个也要加急的情况) + deviation = deviation - 1; if (deviation > 0) { updateUrgentTousse(orgUnitCode, tousseDefinitionId, deviation); }