Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r33657 -r33676 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33657) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33676) @@ -967,7 +967,7 @@ isQuerySum = true; } //获取自定义显示的列 - Set extraQuerys = CssdUtils.getSystemSetConfigByNameToSet("enableTableColumnCustomizationForTheHistoryRecyclingRecordList"); + Set extraQuerys = CssdUtils.getSystemSetConfigByNameToSet("enableTableColumnCustomizationForTheWaitRecycleList"); Map resultMap = invoicePlanManager.getWaitingforRecyclingInvoicePlans(hospitalNumber,patient,loginUserDeptCoding,orgUnitCoding,appType,applyTimeOrder,operationRoom, tousseGroupId,groupId,isQuerySum,pageIndex,pageSize); List invoicePlanList = new ArrayList(); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33656 -r33676 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33656) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33676) @@ -5512,7 +5512,7 @@ record.setHospitalNumber(rs.getString("hospitalNumber")); } if(extraQuerys.contains("申请单号")){ - record.setHospitalNumber(rs.getString("serialNumber")); + record.setSerialNumber(rs.getString("serialNumber")); } } record.setDepart(rs.getString("depart")); @@ -5624,7 +5624,7 @@ listOfItems += ","; } i++; - listOfItems = tousseName + CssdUtils.splitSetIntoString(barcodes, ",", "", "(", ")"); + listOfItems += tousseName + CssdUtils.splitSetIntoString(barcodes, ",", "", "(", ")"); } if(StringUtils.isNotBlank(listOfItems)){ vo.setListOfItems(listOfItems);