Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java
===================================================================
diff -u -r22265 -r22365
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java	(.../ExpensiveGoodsSupplierAction.java)	(revision 22265)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java	(.../ExpensiveGoodsSupplierAction.java)	(revision 22365)
@@ -136,7 +136,16 @@
 	public String saveSupplier() {
 		String registrationsConfigResult = StrutsParamUtils.getPraramValue(
 				"registrationsConfigResult", "");
-		expensiveGoodsSupplierManager.saveOrUpdate(expensiveGoodsSupplier,registrationsConfigResult);
+		JSONObject obj = new JSONObject();
+		obj.put("success", true);
+		try {
+		    expensiveGoodsSupplierManager.saveOrUpdate(expensiveGoodsSupplier,registrationsConfigResult);
+		}catch (Exception e) {
+			e.printStackTrace();
+			obj.put("success", false);
+		 	obj.put("errorMessage", e.getMessage());
+		}
+		StrutsResponseUtils.output(obj);
 		return null;
 	}
 	
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r22280 -r22365
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 22280)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 22365)
@@ -157,6 +157,16 @@
 }
 </style>
 
+<!-- 高值耗材过期注册证是否显示 -->
+<style type="text/css">
+.show{
+    visibility:visible;
+}
+.hide{
+    visibility:collapse;
+}
+</style>
+
 <script>
 	var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';
 var openFlag = '<%=openSelectOrgUnitWindow%>';  //决定要不要显示切换科室的窗口
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManagerImpl.java
===================================================================
diff -u -r22283 -r22365
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManagerImpl.java	(.../RegistrationCertificationManagerImpl.java)	(revision 22283)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManagerImpl.java	(.../RegistrationCertificationManagerImpl.java)	(revision 22365)
@@ -18,6 +18,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
@@ -141,6 +142,12 @@
 		for(RegistrationCertification registrationCertification : registrationCertifications){
 			//原有的注册证和JS传过来的值比较少了就执行删除操作
  			if(!list.contains(registrationCertification.getId()) && Long.parseLong(id) != 0 ){
+ 				//删除注册证时查询下是否有绑定高值耗材
+ 				String expensiveGoodsSql = "where po.registrationCertification.expensiveGoodsSupplier.id =" + registrationCertification.getExpensiveGoodsSupplier().getId();
+ 				ExpensiveGoods expensiveGoods = (ExpensiveGoods) objectDao.getBySql(ExpensiveGoods.class.getSimpleName(), expensiveGoodsSql);
+ 				if(expensiveGoods != null){
+ 					throw new RuntimeException("注册证:["+registrationCertification.getCertification()+"]已绑定了高值耗材:["+ expensiveGoods.getName()+"]，不能删除!");
+ 				}
  				objectDao.deleteById(RegistrationCertification.class.getSimpleName(), registrationCertification.getId().toString());;
  			}
  		}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
===================================================================
diff -u -r22357 -r22365
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22357)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22365)
@@ -5,7 +5,8 @@
 var registrationConfig;
 var authorizationCertifications; //授权证信息集合
 var expensiveGoodsSupplierId; //供应商Id
-var expired = false; //判断注册证是否过期
+var expired = false; //判断注册证是否到预警期  true为到了预警期
+var displayExpired = false; // 判断注册证是否显示过期的证件 true为不显示
 function addAndEditSupplier(id) {
 	this.id = id;
 	this.expensiveGoodsSupplierId = id;
@@ -241,11 +242,21 @@
 		  name : 'configGrid',
 		  store : configStore,
 		  cm : registrationCm,
+		  viewConfig: {
+		      forceFit: true,
+		      getRowClass: function(record, index) {
+		          var displayExpired = record.data.displayExpired;
+		          if (displayExpired) {
+		              return 'hide'; //隐藏过期的注册证
+		          }else{
+		              return 'show'; //显示过期的注册证
+		          }
+		      }
+		  },
 		  height:300,
 		  frame : false,
 		  bodyStyle : 'border:1px solid #afd7af',
 		  autoExpandColumn : 'count',
-		  viewConfig: {forceFit:true},
 		  clicksToEdit : 1,//设置点击几次才可编辑 
 		  selModel : new top.Ext.grid.RowSelectionModel({
 			  singleSelect : false
@@ -284,25 +295,20 @@
 		  },{
 			  text : '是否显示过期的注册证:'
 		  },{	
-			  xtype : 'combo',
-			  dataIndex:'expired',
+			  xtype : 'checkbox',
+			  dataIndex:'expireds',
 			  valueField : 'value',
 			  displayField : 'value',
 			  id : "expireds",
 			  name : "expireds",
-			  store : new Ext.data.SimpleStore({
-				  data:[[STR_YES],[STR_NO]],
-				  fields:['value']
-			  }),
-			  value: STR_NO,
 			  mode : 'local',
-			  width : 55,
+			  width : 20,
 			  forceSelection : true,
 			  editable : false,
 			  triggerAction : 'all',
 			  listeners :{
-				  select:function(combo, records, index ){
-					  initializeData(combo.value);  
+				  check:function(obj, checkd ){
+					  initializeData(checkd);  
 				  }
 			  }
 		  }],
@@ -626,17 +632,19 @@
 				if(warningUntil < date){
 					expired = true;
 				}
+				displayExpired = false;
 			    //不显示过期的注册证 ,默认是不显示的
 				if(new Date(supplierRegistrationCertificate.validityTime.time).getTime() < date){
-				   continue;
+					displayExpired = true;
 				}
 				var supplierRegistrationCertificates = new registrationCertificateConfig({
 					id : supplierRegistrationCertificate.id,
 					certificationType : registrationCertification,
 					certification : supplierRegistrationCertificate.certification,
 					validityTime :new Date(supplierRegistrationCertificate.validityTime.time),
 					type : supplierRegistrationCertificate.type,
-					expired : expired
+					expired : expired,
+					displayExpired : displayExpired
 				});
 				configStore.add(supplierRegistrationCertificates);
 			}
@@ -660,6 +668,7 @@
 				newCertificate();
 			}
 			expired = false; //初始化为False
+			displayExpired = false; //初始化为False
 		},
 		failure : function(form, action) {
 		}
@@ -750,7 +759,7 @@
 						grid.dwrReload();
 					},
 					failure : function(form, action) {
-						showResult(action.result.message);
+						showResult(action.result.errorMessage);
 						top.Ext.getCmp('saveBtn').enable();
 					}
 				});
@@ -823,10 +832,11 @@
 					if(warningUntil < date){
 						expired = true;
 					}
+					displayExpired = false;//初始化为false
 					//判断是否显示过期的注册证 ,默认是不显示的
-					if(expireds == STR_NO){
+					if(!expireds){
 						if(new Date(supplierRegistrationCertificate.validityTime.time).getTime() < date){
-							   continue;
+							displayExpired = true;
 						}
 					}
 					var supplierRegistrationCertificates = new registrationCertificateConfig({
@@ -835,7 +845,8 @@
 						certification : supplierRegistrationCertificate.certification,
 						validityTime :new Date(supplierRegistrationCertificate.validityTime.time),
 						type : supplierRegistrationCertificate.type,
-						expired : expired
+						expired : expired,
+						displayExpired : displayExpired
 					});
 					configStore.add(supplierRegistrationCertificates);
 				}
@@ -853,6 +864,7 @@
 					configStore.add(supplierRegistrationCertificates);
 				}
 				expired = false;//初始化为false
+				displayExpired = false;//初始化为false
 			},
 			failure : function(form, action) {
 			}