Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java =================================================================== diff -u -r21151 -r21232 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 21151) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 21232) @@ -250,8 +250,11 @@ * 高值耗材id */ private Long expensiveGoodsId; + /** + * 是否快速发货 + */ + private String expressInvoice; - public TousseItem(){ } @@ -312,7 +315,33 @@ public void setExpensiveGoodsId(Long expensiveGoodsId) { this.expensiveGoodsId = expensiveGoodsId; } + + /** + * 获取快速发货的值。不要直接调用,改为调用{@link TousseDefinition#expressInvoice()}方法判断是否快速发货 + * @return + */ + public String getExpressInvoice() { + return StringTools.defaultIfBlank(expressInvoice,Constants.STR_NO); + } + /** + * 设置是否快速发货。 + * @param expressInvoice 值为是或者否。非是即为否 + */ + public void setExpressInvoice(String expressInvoice) { + if(!Constants.STR_YES.equals(expressInvoice)){ + expressInvoice = Constants.STR_NO; + } + this.expressInvoice = expressInvoice; + } + /** + * 判断是否可以快速发货。值为是才是可以快速发货,其他值都不可以快速发货。非是即为否 + * @return true可以快速发货。false,不可以快速发货 + */ + public boolean expressInvoice(){ + return Constants.STR_YES.equals(getExpressInvoice()); + } + public void setUrgentAmount(Integer urgentAmount) { if(urgentAmount == null || urgentAmount < 0){ this.urgentAmount = 0;