Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java =================================================================== diff -u -r14750 -r15157 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 14750) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 15157) @@ -60,6 +60,10 @@ * 是否已经装配 */ private String hasPacked = Constants.STR_NO; + /** + * 器械包数量 + */ + private Integer tousseAmount; @JsonIgnore private List foreignProxyItems = new ArrayList(); @@ -182,4 +186,14 @@ } return false; } + + public Integer getTousseAmount() { + return tousseAmount; + } + + public void setTousseAmount(Integer tousseAmount) { + this.tousseAmount = tousseAmount; + } + + } \ No newline at end of file Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r15061 -r15157 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15061) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15157) @@ -699,6 +699,8 @@ printTousseInstances.addAll(tousseInstances); } + foreignProxyDisinfection.setTousseAmount(printTousseInstances.size()); + objectDao.saveOrUpdate(foreignProxyDisinfection); return foreignProxyDisinfection; } Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r15043 -r15157 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15043) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15157) @@ -18,7 +18,7 @@ public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", - "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7"};// 版本列表 + "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15129 -r15157 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15129) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15157) @@ -2172,8 +2172,11 @@ var columns = [ {header : "流水号",width : 90,dataIndex : 'serialNumber', renderer : modifyRecord}, - {header : "申请科室",width : 150,dataIndex : 'depart'}, {header : "灭菌员",width : 80,dataIndex : 'applicant',hidden : sstsConfig.hiddenForeignProxyPartElement}, + {header : "申请科室",width : 150,dataIndex : 'depart'}, + {header : "器械包数量",width : 80,dataIndex : 'tousseAmount'}, + {header : "是否打印",width : 65,dataIndex : 'hasPrinted'}, + {header : "状态",width : 70,dataIndex : 'deliverStatus'}, {header : "制作者",width : 80,dataIndex : 'maker'}, {header : "核对者",width : 80,dataIndex : 'assistant'}, {header : "是否装配",width : 65,dataIndex : 'hasPacked',renderer : function(value, meta) { @@ -2183,12 +2186,10 @@ } return value; }}, - {header : "是否打印",width : 65,dataIndex : 'hasPrinted'}, {header : "申请时间",width : 115,dataIndex : 'applicationTime',renderer : myDateFormatByMinute}, {header : "送来时间",width : 115,dataIndex : 'arrivedTime',renderer : myDateFormatByMinute}, {header : "预约时间",width : 115,dataIndex : 'scheduleTime',renderer : myDateFormatByMinute}, {header : "所属分组",width : 120,dataIndex : 'foreignProxyGroup',hidden : sstsConfig.hiddenForeignProxyPartElement}, - {header : "状态",width : 70,dataIndex : 'deliverStatus'}, {header:'查看发货单',align :'center',renderer: function(v,p,record){ var status = record.data.deliverStatus; if(status == '已发货'){ @@ -2214,6 +2215,7 @@ {name : 'arrivedTime'}, {name : 'scheduleTime'}, {name : 'depart'}, + {name : 'tousseAmount'}, {name : 'foreignProxyGroup'}, {name : 'remark'}, {name : 'deliverStatus'}, @@ -2230,6 +2232,7 @@ {type : 'string',dataIndex : 'assistant'}, {type : 'string',dataIndex : 'deliverStatus'}, {type : 'string',dataIndex : 'depart'}, +// {type : 'string',dataIndex : 'tousseAmount'}, {type : 'string',dataIndex : 'foreignProxyGroup'}, {type : 'string',dataIndex : 'remark'}, {type : 'date',dataIndex : 'applicationTime'},