Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r17025 -r17027 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 17025) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 17027) @@ -1324,7 +1324,7 @@ */ public void setDiscountPriceBySelf(){ //如果包定义是器械包、敷料包或外部代理灭菌时,则设置该包实例的折扣价为包定义的折扣价 - if(tousseDefinition.isComboTousse() || tousseDefinition.isDressing() || tousseDefinition.isForeignProxyTousse()){ + if(tousseDefinition.isInsideTousse() || tousseDefinition.isDressing() || tousseDefinition.isForeignProxyTousse()){ setDiscountPrice(tousseDefinition.getDiscountPrice()); //如果是消毒物品。是否整包申请为是的包实例的折扣价为包定义的折扣价,是否整包申请为否的则为原价