Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r15680 -r15708 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 15680) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 15708) @@ -141,7 +141,12 @@ private Integer dressingTousseAmount;// 敷料包总数 private Integer proxyTousseAmount; private Integer amount;// 总数 - + + /** + * 本炉次用的灭菌篮筐总数 + */ + private Integer reviewedBasketAmount; + private SterilizerGrossRecord sterilizerGrossRecord; @Id @@ -493,6 +498,15 @@ public void setBiologicalMonitoringStartDate(Date biologicalMonitoringStartDate) { this.biologicalMonitoringStartDate = biologicalMonitoringStartDate; } + + @Transient + public Integer getReviewedBasketAmount() { + return reviewedBasketAmount; + } + + public void setReviewedBasketAmount(Integer reviewedBasketAmount) { + this.reviewedBasketAmount = reviewedBasketAmount; + } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r15680 -r15708 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15680) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15708) @@ -1416,7 +1416,7 @@ items : [{ layout : 'column', items : [{ - columnWidth : 0.71, + columnWidth : 0.75, layout : 'column', items : [{ xtype : "fieldset", @@ -1964,7 +1964,7 @@ items : [ new top.Ext.grid.GridPanel({ id : 'tousseItemCountPanel', height : 325, - width : 341, +// width : 341, frame : false, border : true, tbar:[{ @@ -2186,7 +2186,7 @@ ] }] },{ - columnWidth : 0.29, + columnWidth : 0.25, bodyStyle : 'margin-left:2px;margin-right:0px', layout : 'fit', items : [{ @@ -2348,7 +2348,8 @@ var f_amount = action.result.data.foreignTousseAmount; var d_amount = action.result.data.dressingTousseAmount; var p_amount = action.result.data.proxyTousseAmount; - top.Ext.getCmp('typeTotalAmount').setText("器械包:"+t_amount+" ,敷料包:"+d_amount+" ,外来器械包:"+f_amount+", 代理灭菌包:"+p_amount); + var r_amount = action.result.data.reviewedBasketAmount; + top.Ext.getCmp('typeTotalAmount').setText("篮筐:"+r_amount+" ,器械包:"+t_amount+" ,敷料包:"+d_amount+" ,外来器械包:"+f_amount+", 代理灭菌包:"+p_amount); } var physicsResult = action.result.data.physicsResult; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r15684 -r15708 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 15684) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 15708) @@ -312,6 +312,12 @@ } }); List interruptRecords = sterilizationRecordManager.getInerruptRecords(sterilizationRecord.getId()); + List reviewedBasketList = sterilizationRecord.getReviewedBaskets(); + + if (reviewedBasketList != null) { //本炉次用的灭菌篮筐总数 + sterilizationRecord.setReviewedBasketAmount(reviewedBasketList.size()); + } + Map map = new HashMap(); map.put("success", true); map.put("data", sterilizationRecord);