Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_2.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_2.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_2.jrxml (revision 35015)
@@ -0,0 +1,490 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1826" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub2.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub2.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub2.jrxml (revision 35015)
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView1_0.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView1_0.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView1_0.jrxml (revision 35015)
@@ -0,0 +1,423 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1376" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_1.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_1.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_1.jrxml (revision 35015)
@@ -0,0 +1,474 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1676" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r33412 -r35015
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js (.../useRecordItemView.js) (revision 33412)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js (.../useRecordItemView.js) (revision 35015)
@@ -27,7 +27,7 @@
var tousseInstanceIds = Ext.getCmp('tousseInstanceIds').getValue(); //器械包 id
var disposableGoodIds = Ext.getCmp('disposableGoodIds').getValue(); //一次性物品 id
var expensiveGoodIds = Ext.getCmp('expensiveGoodIds').getValue(); //高值耗材 id
-
+ var tousseTypes = $Id('tousseType').value;
myMask = new Ext.LoadMask(Ext.getBody(), {
msg: '正在加载，请稍候！',
removeMask: true
@@ -40,6 +40,7 @@
startDay: startTime,
endDay: endTime,
depart: departSearch,
+ tousseTypes:tousseTypes,
operatorSearch: operatorSearch,
hospitalNum: hospitalNum,
tousseInstanceIds: tousseInstanceIds,
@@ -172,7 +173,13 @@
}
}
});
-
+ /**
+ * 器械包combo的store
+ */
+ var tousseTypeStore = new Ext.data.SimpleStore( {
+ fields : ['value'],
+ data : [[ALL],[INSIDE],[DRESSING],[COMBO],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[FOREIGNSPLIT],[CUSTOM]]
+ });
var comboGoodsRecord = Ext.data.Record.create([
{ name: 'id', mapping: 'id' },
{ name: 'type', mapping: 'type' },
@@ -509,6 +516,35 @@
}
}
}]
+ },{
+ columnWidth : .2,
+ layout : 'form',
+ items : [{
+ xtype : 'multiSelect',
+ fieldLabel : "器械包类型",
+ valueField : 'value',
+ displayField : 'value',
+ store : tousseTypeStore,
+ triggerAction : 'all',
+ id : 'tousseType',
+ name : 'tousseType',
+ allowBlank : true,
+ readOnly:true,
+ mode : 'local',
+ value : ALL,
+ anchor : '95%',
+ listeners: {
+ select: function (combo, record, index) {
+ if (record.get('value') == '全部') {
+ if (record.get('checked')) {
+ combo.selectAll()
+ } else {
+ combo.deselectAll()
+ }
+ }
+ }
+ }
+ }]
}, {
layout: 'form',
columnWidth: 1,
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_2.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_2.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_2.jrxml (revision 35015)
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1526" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_0.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java
===================================================================
diff -u -r16986 -r35015
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java (.../UseRecordEnteringTousse.java) (revision 16986)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java (.../UseRecordEnteringTousse.java) (revision 35015)
@@ -21,8 +21,14 @@
* 装配时所绑定的标识牌定义的使用次数
*/
private Integer useAmount;
-
-
+ /**
+ * 自定义列1
+ */
+ private String subCustomColumnValue1;
+ /**
+ * 自定义列2
+ */
+ private String subCustomColumnValue2;
public String getTousseName() {
return tousseName;
}
@@ -63,5 +69,21 @@
this.useAmount = useAmount;
}
+ public String getSubCustomColumnValue1() {
+ return subCustomColumnValue1;
+ }
+
+ public void setSubCustomColumnValue1(String subCustomColumnValue1) {
+ this.subCustomColumnValue1 = subCustomColumnValue1;
+ }
+
+ public String getSubCustomColumnValue2() {
+ return subCustomColumnValue2;
+ }
+
+ public void setSubCustomColumnValue2(String subCustomColumnValue2) {
+ this.subCustomColumnValue2 = subCustomColumnValue2;
+ }
+
}
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView1_2.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub1.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java
===================================================================
diff -u -r14653 -r35015
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java (.../UseRecordEnteringBean.java) (revision 14653)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java (.../UseRecordEnteringBean.java) (revision 35015)
@@ -31,7 +31,14 @@
private String doctorName; //医生名称（陈家儒改）
private String operation; //手术名称（陈家儒改）
-
+ /**
+ * 自定义列1的值
+ */
+ private String customColumnValue1;
+ /**
+ * 自定义列2的值
+ */
+ private String customColumnValue2;
public String getOperator() {
return operator;
}
@@ -103,4 +110,21 @@
public void setOperation(String operation) {
this.operation = operation;
}
+
+ public String getCustomColumnValue1() {
+ return customColumnValue1;
+ }
+
+ public void setCustomColumnValue1(String customColumnValue1) {
+ this.customColumnValue1 = customColumnValue1;
+ }
+
+ public String getCustomColumnValue2() {
+ return customColumnValue2;
+ }
+
+ public void setCustomColumnValue2(String customColumnValue2) {
+ this.customColumnValue2 = customColumnValue2;
+ }
+
}
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_2.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_2.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_1.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_0.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_0.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView2_0.jrxml (revision 35015)
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1526" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_1.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_1.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView0_1.jrxml (revision 35015)
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="38" splitType="Stretch">
+ <textField pattern="" isBlankWhenNull="true">
+ <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1376" height="38" forecolor="#000000" backcolor="#FFFFFF"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+ <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+ <paragraph lineSpacing="Single"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView1_0.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r34994 -r35015
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34994)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35015)
@@ -1687,7 +1687,7 @@
}
}
}
- return jasperReportManager.getUseRecordItemDataSource(requestParameters);
+ return jasperReportManager.getUseRecordItemDataSource(requestParameters, parametMap);
}else if (reportName.equals("useRecordOperatorTotalView")) {//使用记录人员汇总报表
return getUserRecordOperatorTotalViewDataSource();
} else if ("materialDamageItemView".equals(reportName)) {//器械报损明细统计报表
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
===================================================================
diff -u -r33400 -r35015
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 33400)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 35015)
@@ -1,4 +1,5 @@
<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
<%@page import="com.forgon.Constants"%>
<%@page contentType="text/html; charset=UTF-8"%>
<%@include file="/common/taglibs.jsp"%>
@@ -30,6 +31,15 @@