Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r29301 -r29314
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 29301)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 29314)
@@ -528,7 +528,7 @@
 		}
 		
 		//待签收物品过期提醒
-		if(currentOrgUnit != null && currentOrgUnit.getIsDeliveryToSignOrgUnit() != null && currentOrgUnit.getIsDeliveryToSignOrgUnit()){
+		if(currentOrgUnit != null && currentOrgUnit.isDeliveryToSignOrgUnit()){
 			SystemWarningItemVO waiteSignWarningVO = getWaiteSignWarningVO(currentOrgUnit);
 			if(waiteSignWarningVO != null){
 				warningList.add(waiteSignWarningVO);
Index: forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
===================================================================
diff -u -r29301 -r29314
--- forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml	(.../OrgUnit.hbm.xml)	(revision 29301)
+++ forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml	(.../OrgUnit.hbm.xml)	(revision 29314)
@@ -46,7 +46,7 @@
         <property name="idFromHisSync" type="java.lang.Long" />
         <property name="disposablePriceFluctuation" type="java.math.BigDecimal" precision="19" scale="4"/>
 		<property name="status" type="java.lang.Integer" />
-		<property name="isDeliveryToSignOrgUnit" type="java.lang.Boolean" />
+		<property name="isDeliveryToSignOrgUnit" type="java.lang.String" length="200" />
 
         <set
            name="orgUserRelationes"
Index: forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManagerImpl.java
===================================================================
diff -u -r29301 -r29314
--- forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManagerImpl.java	(.../TimeoutManagerImpl.java)	(revision 29301)
+++ forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManagerImpl.java	(.../TimeoutManagerImpl.java)	(revision 29314)
@@ -10,6 +10,7 @@
 
 import net.sf.json.JSONObject;
 
+import com.forgon.Constants;
 import com.forgon.timeout.model.TimeoutParameter;
 import com.forgon.timeout.model.TimeoutSetting;
 import com.forgon.directory.model.OrgUnit;
@@ -103,9 +104,13 @@
 			for (OrgUnit orgUnit : warningOrgUnit) {
 				orgUnitIds.add(orgUnit.getId());
 			}
-			String updateSql1 = String.format(" update %s set isDeliveryToSignOrgUnit = 0 where %s and isDeliveryToSignOrgUnit = 1 ", OrgUnit.class.getSimpleName(), SqlUtils.getNonStringFieldNotInCollectionsPredicate("id", orgUnitIds));
+			String updateSql1 = String.format(" update %s set isDeliveryToSignOrgUnit = '%s' where %s and isDeliveryToSignOrgUnit = '%s' ",
+					OrgUnit.class.getSimpleName(), Constants.STR_NO, 
+					SqlUtils.getNonStringFieldNotInCollectionsPredicate("id", orgUnitIds), Constants.STR_YES);
 			objectDao.excuteSQL(updateSql1);
-			String updateSql2 = String.format(" update %s set isDeliveryToSignOrgUnit = 1 where %s  and (isDeliveryToSignOrgUnit = 0 or isDeliveryToSignOrgUnit is null) ", OrgUnit.class.getSimpleName(), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", orgUnitIds));
+			String updateSql2 = String.format(" update %s set isDeliveryToSignOrgUnit = '%s' where %s  and (isDeliveryToSignOrgUnit = '%s' or isDeliveryToSignOrgUnit is null) ",
+					OrgUnit.class.getSimpleName(), Constants.STR_YES,
+					SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", orgUnitIds), Constants.STR_NO);
 			objectDao.excuteSQL(updateSql2);
 		}
 	}
@@ -223,7 +228,7 @@
 				String orgUnitNames = "";
 				String orgUnitIds = "";
 				String orgUnitCodes = "";
-				String hql = String.format("from %s po where po.isDeliveryToSignOrgUnit = 1", OrgUnit.class.getSimpleName());
+				String hql = String.format("from %s po where po.isDeliveryToSignOrgUnit = '%s'", OrgUnit.class.getSimpleName(), Constants.STR_YES);
 				@SuppressWarnings("unchecked")
 				List<OrgUnit> warnOrgUnits = objectDao.findByHql(hql);
 				if(CollectionUtils.isNotEmpty(warnOrgUnits)){
Index: forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
===================================================================
diff -u -r29301 -r29314
--- forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java	(.../OrgUnit.java)	(revision 29301)
+++ forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java	(.../OrgUnit.java)	(revision 29314)
@@ -125,7 +125,7 @@
 	/**
 	 * 是否是发货到签收超时提醒的科室(DGSDBZXYY-66 待签收物品过期提醒)
 	 */
-	private Boolean isDeliveryToSignOrgUnit;
+	private String isDeliveryToSignOrgUnit;
 
 	public String getDescription() {
 		return description;
@@ -563,11 +563,16 @@
 		this.disposablePriceFluctuation = disposablePriceFluctuation;
 	}
 
-	public Boolean getIsDeliveryToSignOrgUnit() {
+	@Transient
+	public boolean isDeliveryToSignOrgUnit() {
+		return StringUtils.equals(Constants.STR_YES, isDeliveryToSignOrgUnit);
+	}
+	
+	public String getIsDeliveryToSignOrgUnit() {
 		return isDeliveryToSignOrgUnit;
 	}
 	
-	public void setIsDeliveryToSignOrgUnit(Boolean isDeliveryToSignOrgUnit) {
+	public void setIsDeliveryToSignOrgUnit(String isDeliveryToSignOrgUnit) {
 		this.isDeliveryToSignOrgUnit = isDeliveryToSignOrgUnit;
 	}