Index: ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jrxml
===================================================================
diff -u -r41568 -r41589
--- ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jrxml	(.../instrumentRepairReportVersion3.jrxml)	(revision 41568)
+++ ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jrxml	(.../instrumentRepairReportVersion3.jrxml)	(revision 41589)
@@ -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="instrumentRepairReport" language="groovy" pageWidth="2250" pageHeight="300" columnWidth="2250" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="1058"/>
+	<property name="ireport.x" value="628"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -315,7 +315,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="SansSerif" size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{repairDesc}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{repairDesc} == null?" ":$F{repairDesc}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
Index: ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jasper
===================================================================
diff -u -r41568 -r41589
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jrxml
===================================================================
diff -u -r41568 -r41589
--- ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jrxml	(.../instrumentRepairReport_subreportVersion3.jrxml)	(revision 41568)
+++ ssts-web/src/main/webapp/jasperRtp/instrumentRepairReport_subreportVersion3.jrxml	(.../instrumentRepairReport_subreportVersion3.jrxml)	(revision 41589)
@@ -79,7 +79,7 @@
 					<font fontName="SansSerif" size="12"/>
 					<paragraph lineSpacing="Single" lineSpacingSize="1.0"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{tousseName}== null?" ":$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" stretchType="RelativeToBandHeight" x="200" y="0" width="100" height="30" backcolor="#EAFFFF"/>
@@ -91,7 +91,7 @@
 					<font fontName="SansSerif" size="12"/>
 					<paragraph lineSpacing="Single" lineSpacingSize="1.0"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{instrumentBarcode}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{instrumentBarcode} == null?" ":$F{instrumentBarcode}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" stretchType="RelativeToBandHeight" x="300" y="0" width="100" height="30" backcolor="#EAFFFF"/>
@@ -103,7 +103,7 @@
 					<font fontName="SansSerif" size="12"/>
 					<paragraph lineSpacing="Single" lineSpacingSize="1.0"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{deviceType}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{deviceType}==null?" ":$F{deviceType}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" stretchType="RelativeToBandHeight" x="400" y="0" width="100" height="30" backcolor="#EAFFFF"/>
@@ -115,7 +115,7 @@
 					<font fontName="SansSerif" size="12"/>
 					<paragraph lineSpacing="Single" lineSpacingSize="1.0"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{faultLocation}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{faultLocation} == null?" ":$F{faultLocation}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" stretchType="RelativeToBandHeight" x="700" y="0" width="100" height="30" backcolor="#EAFFFF"/>
@@ -127,7 +127,7 @@
 					<font fontName="SansSerif" size="12"/>
 					<paragraph lineSpacing="Single" lineSpacingSize="1.0"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{idCardInstanceBarcode}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{idCardInstanceBarcode}==null?" ":$F{idCardInstanceBarcode}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
Index: ssts-web/src/main/webapp/jasperRtp/instrumentRepairReportVersion3.jasper
===================================================================
diff -u -r41568 -r41589
Binary files differ