Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33674 -r33675
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33674)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33675)
@@ -19437,8 +19437,8 @@
SterilizationAreaWorkLoadBean sterilizerBean = new SterilizationAreaWorkLoadBean();
sterilizerBean.setTagNameSequence(++ tagNameSequence);
sterilizerBean.setSterilizationEndDate(day);
- sterilizerBean.setTagName(sterilizerName + "-总灭菌量");
- ownGroupMap.put(day + "_" + sterilizerName + "_" + "总灭菌量", sterilizerBean);
+ sterilizerBean.setTagName(sterilizerName + "-灭菌量");
+ ownGroupMap.put(day + "_" + sterilizerName + "_" + "灭菌量", sterilizerBean);
}
}
//各个灭菌炉分组的灭菌总量(按天统计)
@@ -19469,7 +19469,9 @@
sql += ",s.name sterilizerName ";
}
sql += " from SterilizationRecord sr join Sterilizer s on s.id=sr.sterilizer_id "
- + "where " + betweenSql
+ + "where sr.status = '"
+ + SterilizationRecord.STERILIZATION_STATUS_END + "' and "
+ + betweenSql
+ " and "
+ orgUnitCodingSql
+ " union all ";
@@ -19478,7 +19480,12 @@
sql += ",null sterilizerName ";
}
sql += "from SterilizationRecord sr join Sterilizer s on s.id=sr.sterilizer_id "
- + "where " + betweenSql
+ + " where (sr.status = '"
+ + SterilizationRecord.STERILIZATION_STATUS_END + "'"
+ + " or sr.status = '"
+ + SterilizationRecord.STERILIZATION_STATUS_FAILURE
+ + "') and "
+ + betweenSql
+ " and "
+ orgUnitCodingSql
+ ") t1 group by "+ t1SterilizerNameSql +"t1.type,t1.endDate,t1.tagName order by t1.endDate"
@@ -19501,7 +19508,7 @@
}
if(showsterilizationAmountPerSterilizer){
String sterilizerName = StringTools.defaultString(result.getString("sterilizerName"));
- SterilizationAreaWorkLoadBean bean21 = ownGroupMap.get(endDate + "_" + sterilizerName + "_"+"总灭菌量");
+ SterilizationAreaWorkLoadBean bean21 = ownGroupMap.get(endDate + "_" + sterilizerName + "_"+"灭菌量");
if (bean21 != null) { //正常情况下不会出现null的,为了保险还是处理一下空指针,为空不处理
bean21.setAmount(MathTools.add(amount, bean21.getAmount()).intValue());
}
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jasper
===================================================================
diff -u -r33666 -r33675
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml
===================================================================
diff -u -r33666 -r33675
--- ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml (.../sterilizationAreaWorkLoad.jrxml) (revision 33666)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizationAreaWorkLoad.jrxml (.../sterilizationAreaWorkLoad.jrxml) (revision 33675)
@@ -44,7 +44,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -118,7 +118,7 @@
-
+