Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java
===================================================================
diff -u -r34665 -r34687
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34665)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34687)
@@ -17,6 +17,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch;
@@ -135,7 +136,7 @@
 					
 				}
 				
-				String sql = String.format("select ur.id useRecordId, ur.sterilizationRecordId "
+				String sql = String.format("select urd.isDisable,ur.id useRecordId, ur.sterilizationRecordId "
 						+ ",ur.sterilizationStartDate, sr.startDate "
 						+ ",ur.sterilizationUser sterilizationUserUr, sr.sterilizationUser sterilizationUserSr "
 						+ ",ur.sterilizerName sterilizerNameUr, st.name sterilizerNameSr "
@@ -189,7 +190,16 @@
 								vo.setSterilizationPurpose(rs.getString("sterilizationPurposeUr"));
 							}
 							vo.setCreateDateTime(rs.getTimestamp("createDateTime"));
-							vo.setRemark(rs.getString("remark"));
+							String remark = rs.getString("remark");
+							String isDisable = rs.getString("isDisable");
+							if(Constants.STR_YES.equals(isDisable)){
+								if(StringUtils.isBlank(remark)){
+									remark = "已删除";
+								}else{
+									remark += "已删除";
+								}
+							}
+							vo.setRemark(remark);
 							vo.setSterilizationRecordId(rs.getLong("sterilizationRecordId"));
 							vo.setPageNow(pageNow);
 							vo.setPageCount(pageCount);