Index: ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml (revision 31721)
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r31714 -r31721
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31714)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31721)
@@ -90,6 +90,7 @@
import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialTypeWorkloadReport;
import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBeanWith2Column;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseReportDepartVo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean;
import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyInfo;
import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyItem;
@@ -1860,7 +1861,12 @@
String depart = StrutsParamUtils.getPraramValue("depart", "");
parametMap.put("title", "手术室器械包使用分摊费用"+ reportType +"报表(" + startDate + "至" + endDate + ")");
if("明细".equals(reportType)){
- return jasperReportManager.queryUseRecordInfoReportVosData(startDate, endDate, depart, tousseDefinitionName, hospitalNum, treatmentNum, patientName, barcode, status);
+ List operatingRoomUseReportDepartVos = jasperReportManager.queryUseRecordInfoReportVosData(startDate, endDate, depart, tousseDefinitionName, hospitalNum, treatmentNum, patientName, barcode, status);
+ if(CollectionUtils.isEmpty(operatingRoomUseReportDepartVos)){
+ requestParameters.put("jasperreportName",
+ "noDataReport.jasper");
+ }
+ return operatingRoomUseReportDepartVos;
}else{
parametMap.put("applicationDepartShowName", "申请科室");
parametMap.put("settleAccountsDepartShowName", "结算科室");
Index: ssts-web/src/main/webapp/jasperRtp/noDataReport.jasper
===================================================================
diff -u
Binary files differ