Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r30464 -r30476
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 30464)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 30476)
@@ -419,7 +419,7 @@
 	 * @return
 	 */
 	private boolean canCalcframeWidth(String reportName){
-		String canCalcStr = "QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport";
+		String canCalcStr = "formInstanceReport,QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport";
 		if(canCalcStr.indexOf(reportName) != -1){
 			return true;
 		}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r30464 -r30476
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30464)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30476)
@@ -14734,7 +14734,7 @@
 			}
 			List<FormInstance> instanceList = objectDao.findBySql(FormInstance.class.getSimpleName(), sql);
 			if(instanceList != null){
-				
+				int index = 1;
 				for (FormInstance formInstance : instanceList) {
 					List<FormInstanceItem> items = formInstance.getItems();
 					if(items != null){
@@ -14745,7 +14745,7 @@
 								if(options != null){
 									for (FormDefinitionItemOption option : options) {
 										FormInstanceVo vo = new FormInstanceVo();
-										vo.setRowOrderNum("");
+										vo.setRowOrderNum(index + "");
 										vo.setRowGroup(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(formInstance.getCreateDate()));
 										vo.setColumnOrderNum(definitionItem.getOrderNumber());
 										vo.setItemName(definitionItem.getName());
@@ -14756,7 +14756,7 @@
 								}
 							}else{
 								FormInstanceVo vo = new FormInstanceVo();
-								vo.setRowOrderNum("");
+								vo.setRowOrderNum(index + "");
 								vo.setRowGroup(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(formInstance.getCreateDate()));
 								vo.setColumnOrderNum(definitionItem.getOrderNumber());
 								vo.setItemName("");
@@ -14766,6 +14766,7 @@
 							}
 						}
 					}
+					index++;
 				}
 			}
 		}
Index: ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jasper
===================================================================
diff -u -r16084 -r30476
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml
===================================================================
diff -u -r16084 -r30476
--- ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml	(.../formInstanceReport.jrxml)	(revision 16084)
+++ ssts-web/src/main/webapp/jasperRtp/formInstanceReport.jrxml	(.../formInstanceReport.jrxml)	(revision 30476)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="foromInstanceReport" language="groovy" pageWidth="600" pageHeight="842" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a4d7aa1c-2d36-4c35-bb54-a5b7ffe48a4c">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.zoom" value="2.0"/>
+	<property name="ireport.x" value="233"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
 	<style name="table">
@@ -40,8 +40,8 @@
 	<title>
 		<band height="37" splitType="Stretch">
 			<textField>
-				<reportElement uuid="28de467c-2b7a-4f84-b603-dba101607dc9" x="0" y="0" width="600" height="37"/>
-				<textElement verticalAlignment="Middle">
+				<reportElement uuid="28de467c-2b7a-4f84-b603-dba101607dc9" positionType="Float" x="0" y="0" width="600" height="37"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
@@ -55,12 +55,21 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="5cf8b299-921d-46f4-bf07-7315b9c8ecc6" style="table_TD" x="0" y="0" width="117" height="104"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<text><![CDATA[日期]]></text>
+							<reportElement uuid="5cf8b299-921d-46f4-bf07-7315b9c8ecc6" style="table_TD" x="50" y="0" width="117" height="104"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle"/>
+							<text><![CDATA[登记日期]]></text>
 						</staticText>
+						<staticText>
+							<reportElement uuid="7c4aeaf0-0189-42cc-b857-d67116a84930" style="Crosstab Data Text" x="0" y="0" width="50" height="104"/>
+							<box>
+								<topPen lineWidth="0.5"/>
+								<leftPen lineWidth="0.5"/>
+								<bottomPen lineWidth="0.5"/>
+								<rightPen lineWidth="0.5"/>
+							</box>
+							<textElement verticalAlignment="Middle"/>
+							<text><![CDATA[序号]]></text>
+						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
 				<rowGroup name="rowOrderNum" width="0">
@@ -78,7 +87,7 @@
 						<cellContents/>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<rowGroup name="rowGroup" width="117">
+				<rowGroup name="rowGroup" width="167">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{rowGroup}]]></bucketExpression>
 					</bucket>
@@ -88,12 +97,25 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="94be1e4f-6200-40fc-886c-8c8be9dd803b" style="Crosstab Data Text" x="0" y="0" width="117" height="25"/>
+								<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"/>
+									<font size="8"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{rowGroup}]]></textFieldExpression>
 							</textField>
+							<textField>
+								<reportElement uuid="981047ec-3c21-4c3d-a96b-fc76d577cbf9" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+								<box>
+									<topPen lineWidth="0.5"/>
+									<leftPen lineWidth="0.5"/>
+									<bottomPen lineWidth="0.0"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="8"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{rowOrderNum}]]></textFieldExpression>
+							</textField>
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
@@ -125,7 +147,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField isStretchWithOverflow="true">
-								<reportElement uuid="e44a4311-0d34-4b64-90b2-4363bc9141f0" style="Crosstab Data Text" stretchType="RelativeToBandHeight" x="0" y="0" width="81" height="50"/>
+								<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"/>
 								</textElement>
@@ -144,7 +166,11 @@
 					<crosstabColumnHeader>
 						<cellContents backcolor="#F0F8FF" mode="Transparent">
 							<textField>
-								<reportElement uuid="1bbf5bfc-a4f1-464b-b871-d3a933d587fb" style="table_TH" x="0" y="0" width="81" height="54" backcolor="#FFFFFF"/>
+								<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"/>
+									<rightPen lineWidth="0.5"/>
+								</box>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -173,111 +199,6 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell height="25" rowTotalGroup="rowOrderNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="d3f9abb3-9dbb-4208-9c12-7a21b5e063ef" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="columnOrderNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="4ae27b5c-d754-40df-9fa9-b088ed17ee6d" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowOrderNum" columnTotalGroup="columnOrderNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="333f56e7-937b-4478-8cbb-85fb272b3a57" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="itemName">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="cba731c5-806f-43c6-8afe-63bd6217cc2e" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowOrderNum" columnTotalGroup="itemName">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="f8b8b3c8-1473-45ff-8c39-a815530c3340" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell height="25" rowTotalGroup="rowGroup">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="4600980d-07de-4d90-95de-6bb52f55f6b7" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowGroup" columnTotalGroup="columnOrderNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="6959fcc2-738a-42c2-a038-97ff9e105b49" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowGroup" columnTotalGroup="itemName">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="f4502d31-78b5-42ca-b7e6-d2bc3c614a47" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{valueMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="optionNameGroup">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowOrderNum" columnTotalGroup="optionNameGroup">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowGroup" columnTotalGroup="optionNameGroup">
-					<cellContents/>
-				</crosstabCell>
 			</crosstab>
 		</band>
 	</summary>