Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r33252 -r33258 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 33252) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 33258) @@ -1437,6 +1437,37 @@ String endTime = StrutsParamUtils.getPraramValue("endDay", null); return jasperReportManager.getUseRecordDataSource2(departmentName, operator, startTime, endTime); }else if (reportName.equals("useRecordItemView")) {//使用记录录入明细报表 + String aliasNameOfUseRecordFields = CssdUtils.getSystemSetConfigByName("aliasNameOfUseRecordFields"); + if(StringUtils.isNotBlank(aliasNameOfUseRecordFields)){ + JSONArray aliasNameArr = JSONArray.fromObject(aliasNameOfUseRecordFields); + for (int i = 0; i < aliasNameArr.size(); i++) { + JSONObject aliasNameObj = (JSONObject)aliasNameArr.get(i); + String key = aliasNameObj.optString("fieldName"); + if("patient".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "病人姓名")); + }else if("hospitalNumber".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "住院号/诊疗号")); + }else if("depart".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "科室")); + }else if("operator".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "录入人")); + }else if("enterTime".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "录入时间")); + }else if("doctorName".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "医生名称")); + }else if("operation".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "手术名称")); + }else if("barcode".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "条码")); + }else if("idCardInstanceBarcode".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "标识牌条码")); + }else if("tousseName".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "物品名称")); + }else if("useAmount".equals(key)){ + parametMap.put(key, aliasNameObj.optString("displayText", "标识牌使用次数")); + } + } + } return jasperReportManager.getUseRecordItemDataSource(requestParameters); }else if (reportName.equals("useRecordOperatorTotalView")) {//使用记录人员汇总报表 return getUserRecordOperatorTotalViewDataSource(); Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper =================================================================== diff -u -r27687 -r33258 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml =================================================================== diff -u -r27687 -r33258 --- ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 27687) +++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 33258) @@ -1,7 +1,7 @@ - +