Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormInstanceVo.java
===================================================================
diff -u -r16052 -r31896
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormInstanceVo.java	(.../FormInstanceVo.java)	(revision 16052)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormInstanceVo.java	(.../FormInstanceVo.java)	(revision 31896)
@@ -2,7 +2,7 @@
 
 public class FormInstanceVo {
 	
-	private String rowOrderNum;
+	private Integer rowOrderNum;
 	
 	private String rowGroup;
 	
@@ -46,11 +46,11 @@
 		this.value = value;
 	}
 
-	public String getRowOrderNum() {
+	public Integer getRowOrderNum() {
 		return rowOrderNum;
 	}
 
-	public void setRowOrderNum(String rowOrderNum) {
+	public void setRowOrderNum(Integer rowOrderNum) {
 		this.rowOrderNum = rowOrderNum;
 	}
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31862 -r31896
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31862)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31896)
@@ -15077,7 +15077,7 @@
 								if(options != null){
 									for (FormDefinitionItemOption option : options) {
 										FormInstanceVo vo = new FormInstanceVo();
-										vo.setRowOrderNum(index + "");
+										vo.setRowOrderNum(index);
 										vo.setRowGroup(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(formInstance.getCreateDate()));
 										vo.setColumnOrderNum(definitionItem.getOrderNumber());
 										vo.setItemName(definitionItem.getName());
@@ -15093,7 +15093,7 @@
 								}
 							}else{
 								FormInstanceVo vo = new FormInstanceVo();
-								vo.setRowOrderNum(index + "");
+								vo.setRowOrderNum(index);
 								vo.setRowGroup(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(formInstance.getCreateDate()));
 								vo.setColumnOrderNum(definitionItem.getOrderNumber());
 								vo.setItemName("");
Index: ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml
===================================================================
diff -u -r30511 -r31896
--- ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml	(.../formInstanceReport.jrxml)	(revision 30511)
+++ ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml	(.../formInstanceReport.jrxml)	(revision 31896)
@@ -32,7 +32,7 @@
 	<field name="columnOrderNum" class="java.lang.Integer"/>
 	<field name="itemName" class="java.lang.String"/>
 	<field name="optionName" class="java.lang.String"/>
-	<field name="rowOrderNum" class="java.lang.String"/>
+	<field name="rowOrderNum" class="java.lang.Integer"/>
 	<field name="rowGroup" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -77,8 +77,9 @@
 					</cellContents>
 				</crosstabHeaderCell>
 				<rowGroup name="rowOrderNum" width="0">
-					<bucket class="java.lang.String">
+					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{rowOrderNum}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{orderMeasure}]]></orderByExpression>
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents backcolor="#F0F8FF" mode="Opaque">
@@ -100,7 +101,7 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField>
+							<textField isBlankWhenNull="true">
 								<reportElement uuid="94be1e4f-6200-40fc-886c-8c8be9dd803b" style="Crosstab Data Text" x="50" y="0" width="117" height="25"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12"/>
@@ -150,7 +151,7 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField isStretchWithOverflow="true">
+							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 								<reportElement uuid="e44a4311-0d34-4b64-90b2-4363bc9141f0" style="Crosstab Data Text" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="81" height="50"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12"/>
@@ -169,7 +170,7 @@
 					</bucket>
 					<crosstabColumnHeader>
 						<cellContents backcolor="#F0F8FF" mode="Transparent">
-							<textField>
+							<textField isBlankWhenNull="true">
 								<reportElement uuid="1bbf5bfc-a4f1-464b-b871-d3a933d587fb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="0" y="0" width="81" height="54" backcolor="#FFFFFF"/>
 								<box>
 									<leftPen lineWidth="0.5"/>
@@ -178,7 +179,7 @@
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{optionNameGroup}.replace($V{optionNameGroup}.substring(0,$V{optionNameGroup}.lastIndexOf("_")+1), "") ]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{optionNameGroup}.replace($V{optionNameGroup}.substring(0,$V{optionNameGroup}.lastIndexOf("_")+1), "")]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabColumnHeader>
@@ -189,12 +190,15 @@
 				<measure name="valueMeasure" class="java.lang.String">
 					<measureExpression><![CDATA[$F{value}]]></measureExpression>
 				</measure>
+				<measure name="orderMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{rowOrderNum}==null?99999:$F{rowOrderNum}]]></measureExpression>
+				</measure>
 				<crosstabCell width="81" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
+						<textField isBlankWhenNull="true">
 							<reportElement uuid="7a1e626d-f363-45f4-ba54-ad15e7ab2a5a" style="Crosstab Data Text" x="0" y="0" width="81" height="25"/>
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
Index: ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jasper
===================================================================
diff -u -r30511 -r31896
Binary files differ