Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r34742 -r34744 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34742) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34744) @@ -2045,8 +2045,17 @@ boolean merge = StrutsParamUtils.getBoolPraramValue("merge", false); String aliasNameOfSurgicalInstrumentsManagement = CssdUtils.getSystemSetConfigByName("aliasNameOfSurgicalInstrumentsManagement"); if(StringUtils.isNotBlank(aliasNameOfSurgicalInstrumentsManagement)){ - parametMap.put("recipientColumnName", aliasNameOfSurgicalInstrumentsManagement); - }else{ + JSONArray configArr = JSONArray.fromObject(aliasNameOfSurgicalInstrumentsManagement); + for (int i = 0; i < configArr.size(); i++) { + JSONObject config = (JSONObject)configArr.get(i); + String fieldName = config.optString("fieldName"); + if("recipient".equals(fieldName)){ + parametMap.put("recipientColumnName", config.optString("displayText")); + break; + } + } + } + if(!parametMap.containsKey("recipientColumnName")){ parametMap.put("recipientColumnName", "领用人"); } return jasperReportManager.getTousseTraceabilityInquiry(barcode, tousseName, destinationLocation,startDate,endDate,recipient,handover, queryType, merge);