Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java =================================================================== diff -u -r20739 -r20804 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java (.../ExpensiveGoodsInstance.java) (revision 20739) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java (.../ExpensiveGoodsInstance.java) (revision 20804) @@ -51,6 +51,8 @@ private Long godownEntryId;// private Long godownEntryItemId;// + + private Long expensiveGoodsStockId; // private Long userecordId;//使用记录id @@ -190,6 +192,14 @@ // this.userecordId = userecordId; // } + public Long getExpensiveGoodsStockId() { + return expensiveGoodsStockId; + } + + public void setExpensiveGoodsStockId(Long expensiveGoodsStockId) { + this.expensiveGoodsStockId = expensiveGoodsStockId; + } + public String getStatus() { return status; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r20106 -r20804 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 20106) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 20804) @@ -429,6 +429,10 @@ public double getDisposableGoodsFluctuationPrice(double price) { return getFluctuationPrice(getDisposableGoodsFluctuationPercent(),price); } + @Override + public double getExpensiveGoodsFluctuationPrice(double price){ + return price; + } /** * 计算浮动价格。器械包和一次性物品的浮动价格都调用这个方法实现 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java =================================================================== diff -u -r20795 -r20804 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 20795) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 20804) @@ -19,6 +19,7 @@ import org.hibernate.annotations.CascadeType; import com.forgon.Constants; +import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.idpredicate.IDAble; @@ -583,6 +584,17 @@ return false; } + /** + * 是否高值耗材 + */ + @Transient + public boolean isExpensiveGoods(){ + if(StringUtils.equals(tousseType, ExpensiveGoods.TYPE_NAME)){ + return true; + } + return false; + } + public Integer getPrepareRecycleAmount() { return prepareRecycleAmount; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r20083 -r20804 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 20083) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 20804) @@ -90,6 +90,8 @@ * @return 一次性物品原价格与一次性物品浮动价格系数的乘积.如果浮动价格系数小于0,则认为浮动价格系数为1.0 */ public double getDisposableGoodsFluctuationPrice(double price); + + public double getExpensiveGoodsFluctuationPrice(double price); // /** // * 获取器械包的浮动价格 // * @param floatPercent 浮动价格系数