Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r13706 -r13743 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13706) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13743) @@ -978,6 +978,8 @@ } createApplicationItems(recyclingApplication, tousseNameAndAmount); setApplicationStatus(recyclingApplication, tousseNameAndAmount); + // 备注里面增加普通器械包的数量 + RecyclingApplicationUtils.appendTousseAmountRemark(recyclingApplication); //设置处理科室 CssdServiceDepts cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_TOUSSE); if(cssdService != null){ @@ -3090,6 +3092,8 @@ setInstanceCodesToApplication(tousseInstanceCodes, recyclingApplication); setApplicationStatus(recyclingApplication, newTousseNameAndAmountMap); createApplicationItems(recyclingApplication, newTousseNameAndAmountMap); + // 备注里面增加普通器械包的数量 + RecyclingApplicationUtils.appendTousseAmountRemark(recyclingApplication); List items = recyclingApplication.getApplicationItems(); if(items == null){ items = new ArrayList(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java (revision 13743) @@ -0,0 +1,42 @@ +/** + * + */ +package com.forgon.disinfectsystem.recyclingapplication.service; + +import java.util.List; + +import com.forgon.disinfectsystem.common.CssdUtils; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; +import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; + +/** + * @author jeffli + * + */ +public class RecyclingApplicationUtils { + + public static void appendTousseAmountRemark( + RecyclingApplication recyclingApplication) { + List items = recyclingApplication.getApplicationItems(); + int totalAmount = 0; + if (items != null) { + for (TousseItem tousseItem : items) { + if (TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseItem + .getTousseType())) { + Integer amount = tousseItem.getAmount(); + Integer editAmount = tousseItem.getEditAmount(); + if(amount == null){ + amount = 0; + } + if(editAmount == null){ + editAmount = 0; + } + totalAmount += Math.max(amount,editAmount); + } + } + } + String remark = String.format("器械包数量:%s", totalAmount); + CssdUtils.appendRemarkOfInvoicePlan(recyclingApplication, remark); + } +}