Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r27520 -r27533 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 27520) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 27533) @@ -82,7 +82,6 @@ public static final int FOREIGNTOUSSE_SPLIT_PRICE_TYPE_TD = 0; public static final int FOREIGNTOUSSE_SPLIT_PRICE_TYPE_AVG = 1; - private Long id; private String guid; @@ -242,6 +241,7 @@ // terry kwan, 2015-01-08 灭菌物品类型可以删除,实际上消毒物品是一定不需要灭菌的 // 而器械包是一定灭菌的 + // terry kwan, 2019-08-30 消毒物品一般不灭菌,特殊的也可以灭菌,叫做高水平消毒 public static final String PACKAGE_TYPE_STERILIZATION = "灭菌物品"; public static final String PACKAGE_TYPE_DRESSING = "敷料包"; @@ -732,7 +732,13 @@ for (MaterialInstance mi : materialInstances) { int count = mi.getCount(); MaterialDefinition md = mi.getMaterialDefinition(); - Double cost = md.getCost(); + Double cost = 0d; + if (md != null){ + cost = md.getCost(); + } + else { + System.out.println("材料实例MaterialInstance【" + mi.getMaterialName() + "】的材料定义为空!"); + } costPrice = MathTools.add(costPrice, MathTools.mul(count, cost)).doubleValue(); } }