Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java =================================================================== diff -u -r15563 -r15582 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java (.../TousseDefinitionHelper.java) (revision 15563) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java (.../TousseDefinitionHelper.java) (revision 15582) @@ -65,8 +65,8 @@ map = this.setReturnResult(tousseDefinition, price); } } - //如果类型为组合申请单,则保留类型为器械包,消毒物品,敷料包 - else if ("combo".equals(tousseType)) { + //如果类型为组合申请单或者器械包申请单,则保留类型为器械包,消毒物品,敷料包(组合申请单后面会添加一次性物品,器械包申请单则不会) + else if ("combo".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType)) { String type = tousseDefinition.getTousseType(); if (tousseDefinition.PACKAGE_TYPE_INSIDE.equals(type) || TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(type)) { map = this.setReturnResult(tousseDefinition, price);