Index: ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml
===================================================================
diff -u -r17239 -r17255
--- ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml (.../tousseOverLoadReport.jrxml) (revision 17239)
+++ ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml (.../tousseOverLoadReport.jrxml) (revision 17255)
@@ -26,21 +26,21 @@
-
+
-
+
-
-
-
+
+
+
@@ -99,7 +99,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
===================================================================
diff -u -r17243 -r17255
--- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 17243)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 17255)
@@ -109,10 +109,10 @@
for(Entry> entry : frequencyItems.entrySet()){
TousseOverLoadBean first = entry.getValue().get(0);
- assertTrue(StringTools.isNotBlank(first.getRowNum()));
+ assertNotNull(first.getRowNum());
assertTrue(StringTools.isNotBlank(first.getDate()));
assertTrue(StringTools.isNotBlank(first.getSterileProgram()));
- assertTrue(StringTools.isNotBlank(first.getFrequency()));
+ assertNotNull(first.getFrequency());
assertTrue(StringTools.isNotBlank(first.getCombinationCode()));
assertTrue(StringTools.isNotBlank(first.getCombinationCodeCount()));
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17243 -r17255
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17243)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17255)
@@ -189,6 +189,7 @@
import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
import com.forgon.disinfectsystem.vo.TousseOperate;
+import com.forgon.jmesatable.html.tools.NumberUtils;
import com.forgon.systemsetting.model.HttpOption;
import com.forgon.systemsetting.service.HttpOptionManager;
import com.forgon.tools.MathTools;
@@ -13007,7 +13008,8 @@
List voList = new ArrayList();
String sterileStartTime = SqlUtils.getSubStringSql(dbConnection, "ti.sterileStartTime", 0, 10);
- String sql = "select sterilingType,sterileFrequency,"+sterileStartTime+" sterileStartTime,tousseName,count(*) tousseCount from "
+ String frequencyFiled = " cast(ti.sterileFrequency as decimal(10,0)) ";
+ String sql = "select sterilingType,"+frequencyFiled+" sterileFrequency,"+sterileStartTime+" sterileStartTime,tousseName,count(*) tousseCount from "
+ TousseInstance.class.getSimpleName() + " ti join " + TousseDefinition.class.getSimpleName() + " td on td.id = ti.tousseDefinition_id "
+ " where ti.sterilizerName='" + sterilizerName + "' and ti.sterilingType='" + sterilizationType + "'"
+ " and td.tousseType in ('" + TousseDefinition.PACKAGE_TYPE_INSIDE + "','"
@@ -13016,7 +13018,7 @@
+ " or " + dateQueryAdapter.strDateAreasql("ti.sterileEndTime", startDay, endDay, false)
+ " ) and " + where
+ " group by ti.sterilingType,ti.sterileFrequency,"+sterileStartTime+",ti.tousseName"
- + " order by " + sterileStartTime;
+ + " order by " + sterileStartTime + "," + frequencyFiled;
try{
logger.debug("sql:" + sql);
@@ -13025,10 +13027,15 @@
List details = new ArrayList<>();
List allTousseName = new ArrayList<>(); //所有器械包
while(rs.next()){
+ String freq = rs.getString("sterileFrequency");
+ int frequency = 1;
+ try{
+ frequency = Integer.valueOf(freq);
+ }catch(NumberFormatException e){}
TousseOverLoadBean bean = new TousseOverLoadBean();
bean.setDate(rs.getString("sterileStartTime"));
bean.setSterileProgram(rs.getString("sterilingType"));
- bean.setFrequency(rs.getString("sterileFrequency"));
+ bean.setFrequency(frequency);
bean.setTousseName(rs.getString("tousseName"));
bean.setTousseCount(rs.getInt("tousseCount"));
String find = CollectionUtils.find(allTousseName, new Predicate(){
@@ -13080,7 +13087,7 @@
for(TousseOverLoadBean bean : rowBeans){
bean.setCombinationCode(code);
bean.setCombinationCodeCount(combinationCodeCountMap.get(code).toString());
- bean.setRowNum(index+"");
+ bean.setRowNum(index);
}
++index;
}
Index: ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jasper
===================================================================
diff -u -r17239 -r17255
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseOverLoadBean.java
===================================================================
diff -u -r17239 -r17255
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseOverLoadBean.java (.../TousseOverLoadBean.java) (revision 17239)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseOverLoadBean.java (.../TousseOverLoadBean.java) (revision 17255)
@@ -4,7 +4,7 @@
/**
* 行号
*/
- private String rowNum;
+ private Integer rowNum;
/**
* 灭菌日期
*/
@@ -16,7 +16,7 @@
/**
* 灭菌炉次
*/
- private String frequency;
+ private Integer frequency;
/**
* 器械包名称
*/
@@ -34,10 +34,10 @@
*/
private String combinationCodeCount;
- public String getRowNum() {
+ public Integer getRowNum() {
return rowNum;
}
- public void setRowNum(String rowNum) {
+ public void setRowNum(Integer rowNum) {
this.rowNum = rowNum;
}
public String getDate() {
@@ -52,10 +52,10 @@
public void setSterileProgram(String sterileProgram) {
this.sterileProgram = sterileProgram;
}
- public String getFrequency() {
+ public Integer getFrequency() {
return frequency;
}
- public void setFrequency(String frequency) {
+ public void setFrequency(Integer frequency) {
this.frequency = frequency;
}
public String getTousseName() {