Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r20042 -r21632
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 20042)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 21632)
@@ -669,6 +669,19 @@
anchor : '95%'
}]
},{
+ layout:'form',
+ labelWidth : 100,
+ columnWidth: 0.5,
+ items:[{
+ xtype : 'numberfield',
+ allowNegative : false, //不允许负数
+ allowDecimals : false,
+ fieldLabel : '序号',
+ id : 'sequence',
+ name : 'sequence',
+ anchor : '95%'
+ }]
+ },{
columnWidth: 0.97,
layout : 'column',
xtype:'fieldset',
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java
===================================================================
diff -u -r16946 -r21632
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java (.../SterilizingStove_child.java) (revision 16946)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java (.../SterilizingStove_child.java) (revision 21632)
@@ -2,22 +2,46 @@
public class SterilizingStove_child {
+ /**
+ * 科室名称
+ */
private String departName;
+
+ /**
+ * 灭菌炉名称
+ */
private String sterilizerName;
+
+ /**
+ * 灭菌炉的序列号（用于排序）
+ */
+ private Integer sterilizerNameSequence = 0;
+
+ /**
+ * 灭菌完成数量
+ */
private Integer successCount;
+
+ /**
+ * 灭菌失败数量
+ */
private Integer failureCount;
+
/**
* 灭菌时间
*/
private String sterilizaTime;
+
/**
* 灭菌次数
*/
private Integer totalSterilizaCount = 0;
+
/**
* 生物监测次数
*/
private Integer biologicalMonitoringCount = 0;
+
/**
* 显示统计次数的字符串
*/
@@ -71,4 +95,10 @@
public void setCountStr(String countStr) {
this.countStr = countStr;
}
+ public Integer getSterilizerNameSequence() {
+ return sterilizerNameSequence;
+ }
+ public void setSterilizerNameSequence(Integer sterilizerNameSequence) {
+ this.sterilizerNameSequence = sterilizerNameSequence;
+ }
}
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml
===================================================================
diff -u -r17763 -r21632
--- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml (.../sterilizingStoveUseCountDetail.jrxml) (revision 17763)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml (.../sterilizingStoveUseCountDetail.jrxml) (revision 21632)
@@ -50,6 +50,9 @@
+
+
+
@@ -116,6 +119,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -206,6 +226,12 @@
+
+
+
+
+
+
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
===================================================================
diff -u -r20042 -r21632
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 20042)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 21632)
@@ -163,7 +163,13 @@
* 生物监测的默认值
*/
private String biologicalMonitoringDisplay;
+
/**
+ * 序号
+ */
+ public Integer sequence;
+
+ /**
* 是否有待灭菌提示。在PDA灭菌完成后,当前灭菌炉包含的灭菌程序,有待灭菌的物品,如果此配置为“是”，则给出提示。默认配置为否,不提示
*/
private String waitSterilizedPrompt = Constants.STR_NO;
@@ -491,4 +497,12 @@
public void setTimingCompleteSterilization(String timingCompleteSterilization) {
this.timingCompleteSterilization = timingCompleteSterilization;
}
+
+ public Integer getSequence() {
+ return sequence;
+ }
+
+ public void setSequence(Integer sequence) {
+ this.sequence = sequence;
+ }
}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21590 -r21632
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21590)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21632)
@@ -12063,7 +12063,7 @@
private Map getSuccessData(String depart , String departCoding,String sterilizationPurpose,
String startTime, String endTime, String type) {
- String sql = "select s.name,count(*) from SterilizationRecord sr,Sterilizer s "
+ String sql = "select min(s.name) name,count(*) amount,min(s.sequence) sequence from SterilizationRecord sr,Sterilizer s "
+" where sr.sterilizer_id = s.id "
+" and sr.status = '"+type+"'"
+ (StringUtils.isNotBlank(departCoding) ? (" and s.orgUnitCoding = '"+departCoding+"'") : (" and s.department = '"+depart+"'"))
@@ -12075,9 +12075,11 @@
{
sql += " and sr.sterilizationPurpose = '" + sterilizationPurpose + "' ";
}
- sql += " group by s.name";
+ sql += " group by s.id ";
- Map map = new HashMap();
+ sql = String.format("select * from (%s) t order by t.sequence ", sql);
+
+ Map map = new LinkedHashMap();
SterilizingStove_child ssc = null;
ResultSet resultSet = objectDao.executeSql(sql);
try {
@@ -12136,6 +12138,7 @@
}else{
sc = new SterilizingStove_child();
sc.setSterilizerName(sr.getSterilizer().getName());
+ sc.setSterilizerNameSequence(sr.getSterilizer().getSequence());
}
int curCount = sc.getTotalSterilizaCount();
sc.setTotalSterilizaCount(curCount + 1);
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper
===================================================================
diff -u -r17763 -r21632
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js
===================================================================
diff -u -r18276 -r21632
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js (.../sterilizerView.js) (revision 18276)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js (.../sterilizerView.js) (revision 21632)
@@ -135,6 +135,10 @@
width : 80,
dataIndex : 'cost'
},{
+ header : "序号",
+ width : 80,
+ dataIndex : 'sequence'
+ },{
id : 'ownGroup',
header : "所属分组",
width : 80,
@@ -187,6 +191,8 @@
},{
name : 'cost'
},{
+ name : 'sequence'
+ },{
name : 'ownGroup'
}];