Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/InstrumentInstanceVo.java
===================================================================
diff -u -r35194 -r40898
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/InstrumentInstanceVo.java	(.../InstrumentInstanceVo.java)	(revision 35194)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/InstrumentInstanceVo.java	(.../InstrumentInstanceVo.java)	(revision 40898)
@@ -41,6 +41,21 @@
 	 * 标识牌实例id
 	 */
 	private Long idCardInstanceId;
+	
+	/**
+	 * 标识牌条码
+	 */
+	private String idCardInstanceBarcode;
+	
+	/**
+	 * 所属器械包
+	 */
+	private String tousseName;
+	
+	/**
+	 * 器械维修状态	
+	 */
+	private String repairStatus;
 
 	/**
 	 * 最新的器械循环实例id
@@ -198,6 +213,30 @@
 		this.idCardInstanceId = idCardInstanceId;
 	}
 
+	public String getIdCardInstanceBarcode() {
+		return idCardInstanceBarcode;
+	}
+
+	public void setIdCardInstanceBarcode(String idCardInstanceBarcode) {
+		this.idCardInstanceBarcode = idCardInstanceBarcode;
+	}
+
+	public String getTousseName() {
+		return tousseName;
+	}
+
+	public void setTousseName(String tousseName) {
+		this.tousseName = tousseName;
+	}
+
+	public String getRepairStatus() {
+		return repairStatus;
+	}
+
+	public void setRepairStatus(String repairStatus) {
+		this.repairStatus = repairStatus;
+	}
+
 	public Long getNewestCycleInstanceId() {
 		return newestCycleInstanceId;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java
===================================================================
diff -u -r40867 -r40898
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java	(.../InstrumentInstanceManagerImpl.java)	(revision 40867)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java	(.../InstrumentInstanceManagerImpl.java)	(revision 40898)
@@ -1854,9 +1854,9 @@
 		if(StringUtils.isNotBlank(tousseName)){
 			idCardInstanceWhereSql += " and ici.tousseName like '%" + tousseName + "%' ";
 		}
-		if(StringUtils.isNotBlank(idCardInstanceWhereSql)){
-			idCardInstanceJoinSql = String.format(" join %s ici on ici.id = ii.idCardInstanceId join %s icibd on icibd.id = ici.id ", IDCardInstance.class.getSimpleName(), BarcodeDevice.class.getSimpleName());
-		}
+		//if(StringUtils.isNotBlank(idCardInstanceWhereSql)){
+			idCardInstanceJoinSql = String.format(" left join %s ici on ici.id = ii.idCardInstanceId left join %s icibd on icibd.id = ici.id ", IDCardInstance.class.getSimpleName(), BarcodeDevice.class.getSimpleName());
+		//}
 		String fromSql = String.format(" from %s ii "
 				+ "join %s md on md.id = ii.materialDefinitionId "
 				+ "left join %s me on me.id = ii.materialEntryId "
@@ -1901,7 +1901,8 @@
 		if(rowCount > 0){
 			String querySql = String.format("select md.id materialDefinitionId, md.name materialDefinitionName, md.specification, md.inventorySerialNumber, "
 					+ "me.time materialEntryTime, me.operator materialEntryUser, "
-					+ "ii.id, ii.instrumentBarcode, ii.udi, ii.productionDate, ii.productionSerialNumber, ii.registUser %s", fromSql);
+					+ "ii.id, ii.instrumentBarcode, ii.udi, ii.productionDate, ii.productionSerialNumber, ii.registUser, ii.repairStatus, "
+					+ "icibd.barcode idCardInstanceBarcode, ici.tousseName %s", fromSql);
 			int start = (pageNum - 1) * pageSize;
 			int limit = pageSize;
 			if(dbConnection.isSqlServer()){
@@ -1929,6 +1930,9 @@
 					vo.setProductionDate(rs.getTimestamp("productionDate"));
 					vo.setProductionSerialNumber(rs.getString("productionSerialNumber"));
 					vo.setRegistUser(rs.getString("registUser"));
+					vo.setIdCardInstanceBarcode(rs.getString("idCardInstanceBarcode"));
+					vo.setTousseName(rs.getString("tousseName"));
+					vo.setRepairStatus(rs.getString("repairStatus"));
 					vo.setPageCount(pageCount);
 					vo.setRowCount(rowCount);
 					voList.add(vo);