Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java =================================================================== diff -u -r22146 -r22157 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22146) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (.../SterilizationTransitionItem.java) (revision 22157) @@ -30,11 +30,26 @@ private SterilizationTransition sterilizationTransition; /** + * 器械包定义id + */ + private Long tousseDefinitionId; + + /** + * 器械包名称 + */ + private String tousseName; + + /** * 器械包实例id */ private Long tousseInstanceId; /** + * 器械包实例条码 + */ + private Long tousseInstanceBarcode; + + /** * 配包人编码 */ private String packerCode; @@ -54,11 +69,6 @@ */ private String reviewer; - /** - * 数量 - */ - private Integer amount; - @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -81,14 +91,6 @@ this.sterilizationTransition = sterilizationTransition; } - public Integer getAmount() { - return amount; - } - - public void setAmount(Integer amount) { - this.amount = amount; - } - public Long getTousseInstanceId() { return tousseInstanceId; } @@ -128,5 +130,29 @@ public void setReviewer(String reviewer) { this.reviewer = reviewer; } + + public Long getTousseInstanceBarcode() { + return tousseInstanceBarcode; + } + + public void setTousseInstanceBarcode(Long tousseInstanceBarcode) { + this.tousseInstanceBarcode = tousseInstanceBarcode; + } + + public Long getTousseDefinitionId() { + return tousseDefinitionId; + } + + public void setTousseDefinitionId(Long tousseDefinitionId) { + this.tousseDefinitionId = tousseDefinitionId; + } + + public String getTousseName() { + return tousseName; + } + + public void setTousseName(String tousseName) { + this.tousseName = tousseName; + } } Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r20846 -r22157 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 20846) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 22157) @@ -75,6 +75,7 @@ * 判断条码是不是有效(目前系统支持3位、9位、10位的条码) * @param barcode 条码 * @param needVirtualBasketBarcode 需不需要虚拟篮筐条码(值为:true和false) + * return 条码有效则返回true,否则返回false */ function isBarcodeValid(barcode, needVirtualBasketBarcode) { var barcodeReg_3 = /(\d){3}/; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r22146 -r22157 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 22146) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 22157) @@ -20,6 +20,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -472,6 +473,11 @@ private String insteadTiBarcode; /** + * 是否灭菌交接 + */ + private Boolean sterilizationTransition = false; + + /** * 签收记录ID */ private Long signRecordId; @@ -845,6 +851,14 @@ this.invoice_id = invoice_id; } + public Boolean getSterilizationTransition() { + return BooleanUtils.isTrue(sterilizationTransition); + } + + public void setSterilizationTransition(Boolean sterilizationTransition) { + this.sterilizationTransition = sterilizationTransition; + } + public Double getPrice() { return price; }