Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r27520 -r27521 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 27520) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 27521) @@ -1289,7 +1289,7 @@ for (InvoicePlan ip : disinfectApp) { buildJsonItem(jsonArray, ip); } - obj.put("row", jsonArray); + obj.put(JSONUtil.JSON_KEY_ROWS, jsonArray); StrutsResponseUtils.output(obj); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java =================================================================== diff -u -r27516 -r27521 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 27516) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java (.../InvoicePlanManager.java) (revision 27521) @@ -111,7 +111,7 @@ * @param isQuerySum 是否查询符合条件的申请单数和总科室数 * @param pageIndex 页码 * @param pageSize 每页条数 - * return key:JSONObject{invoicePlanAmount(申请单总数):150,departAmount(总科室数量):5} value:List申请单列表,因为put到JSONObject会报错,所以用map保存 + * return {invoicePlanAmount:申请单总数,departAmount:部门总数,invoicePlanList: 申请单列表} */ public Map getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding, String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId, String groupId, Boolean isQuerySum, Integer pageIndex, Integer pageSize);