Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15256 -r15259 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15256) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15259) @@ -2181,6 +2181,7 @@ {header : "器械包数量",width : 80,dataIndex : 'tousseAmount'}, {header : "是否打印",width : 65,dataIndex : 'hasPrinted'}, {header : "状态",width : 70,dataIndex : 'deliverStatus'}, + {header : "物品简要",width : 400,dataIndex : 'lendGoodsBrief'}, {header : "制作者",width : 80,dataIndex : 'maker'}, {header : "核对者",width : 80,dataIndex : 'assistant'}, {header : "是否装配",width : 65,dataIndex : 'hasPacked',renderer : function(value, meta) { @@ -2213,6 +2214,7 @@ var readerDetail = [ {name : 'id'}, {name : 'applicant'}, + {name : 'lendGoodsBrief'}, {name : 'maker'}, {name : 'assistant'}, {name : 'applicationTime'}, Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java =================================================================== diff -u -r14297 -r15259 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java (.../ForeignProxyDisinfectionTableManager.java) (revision 14297) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java (.../ForeignProxyDisinfectionTableManager.java) (revision 15259) @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; +import com.forgon.results.handler.LendGoodsBriefHandler; +import com.forgon.results.handler.ResultBackHandler; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -92,8 +94,10 @@ sql += " and po.depart = ''"; }*/ sql += " and po.handleDepartCoding='" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode() + "'"; - return gridManager.renderGrid(parameterMap, ForeignProxyDisinfection.class - .getSimpleName(), sql, new String[] { "foreignProxyItems","applicationItems","invoice" }); + ResultBackHandler lendGoodsBriefHandler = LendGoodsBriefHandler.getInstance(); + String result = gridManager.renderGrid(parameterMap, ForeignProxyDisinfection.class.getSimpleName(), sql, new String[] { "foreignProxyItems","applicationItems","invoice" }); + result = lendGoodsBriefHandler.handleResult(result); + return result; } public List getTousseInstanceByForeignProxyItemId(String ids){ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r15198 -r15259 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15198) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15259) @@ -741,8 +741,35 @@ // 删除item deleteForeignProxyItems(foreignProxyDisinfection, existIdMap); addNewItems(foreignProxyDisinfection, newItems); + + foreignProxyDisinfection.setLendGoodsBrief(this.buildLendGoodsBrief(params)); + + } + /** + * 构建物品简要,以,号的方式将物品合并在一起 + * @param params 页面传进来的参数 + * @return 完成后的物品简要格式 + */ + private String buildLendGoodsBrief(JSONObject params){ + String itemList = params.getString("itemInfoList"); + StringBuilder sb = new StringBuilder(); + if (StringUtils.isNotBlank(itemList)){ + JSONArray itemInfoList = JSONArray.fromObject(itemList); + for (int i = 0, size = itemInfoList.size(); i < size; i++) { + JSONObject jsonObject = itemInfoList.getJSONObject(i); + String tousseName = jsonObject.getString("tousseName"); + String count = jsonObject.getString("count"); + sb.append(tousseName).append("x").append(count); + if (i != size - 1){ + sb.append(","); + } + } + } + return sb.toString(); + } + private void copyPropertiesForUpdate(ForeignProxyDisinfection modifiedForeignProxyDisinfection,ForeignProxyDisinfection foreignProxyDisinfection){ foreignProxyDisinfection.setForeignProxyGroup(modifiedForeignProxyDisinfection.getForeignProxyGroup()); // foreignProxyDisinfection.setDepart(modifiedForeignProxyDisinfection.getDepart());