Index: forgon-core/src/main/java/com/forgon/systemsetting/action/HttpOptionAction.java
===================================================================
diff -u -r17791 -r19212
--- forgon-core/src/main/java/com/forgon/systemsetting/action/HttpOptionAction.java	(.../HttpOptionAction.java)	(revision 17791)
+++ forgon-core/src/main/java/com/forgon/systemsetting/action/HttpOptionAction.java	(.../HttpOptionAction.java)	(revision 19212)
@@ -15,6 +15,7 @@
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
+import com.forgon.tools.db.DatabaseUtil;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -77,8 +78,11 @@
 			for (int i = 0; i < list.size(); i++) {
 				HttpOption ho = list.get(i);
 				JSONObject obj = new JSONObject();
+				obj.put("id",ho.getId());
 				obj.put("name", ho.getOptionText());
-				obj.put("value", ho.getOptionValue());
+				obj.put("optionValue", ho.getOptionValue());
+				obj.put("optionListId", ho.getOptionListId());
+				obj.put("sequence", ho.getSequence());
 				array.add(obj);
 			}
 		}
Index: ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp
===================================================================
diff -u -r18260 -r19212
--- ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp	(.../httpOptionByValue.jsp)	(revision 18260)
+++ ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp	(.../httpOptionByValue.jsp)	(revision 19212)
@@ -49,7 +49,7 @@
 <script type="text/javascript" >
 HttpOption = function (itemText, itemValue, seq, listId){
     this.optionText = itemText;
-    this.optionValue = itemValue;
+    this.id = itemValue;
     this.sequence = parseInt(seq) + 1;
     this.optionListId = listId; 
 }
@@ -131,7 +131,7 @@
                 <td class="form_table_tr_bottom" align="center" valign="middle" colspan="2">
                   <select name="selectListBox" id="selectListBox" size="8" style="width:400px;" ondblclick="modifyListBoxItemByValue('modifyInput', 'modifyValueInput', 'selectListBox', 'apply')">
                   <c:forEach var="optionItem" begin="" items="${optionList}"> 
-                  <option value="${optionItem.optionValue}">${optionItem.optionText}</option>
+                  <option value="${optionItem.id}">${optionItem.optionText}</option>
                   </c:forEach>
                   </select>
                 </td>
Index: forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
===================================================================
diff -u -r17836 -r19212
--- forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java	(.../HttpOption.java)	(revision 17836)
+++ forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java	(.../HttpOption.java)	(revision 19212)
@@ -168,7 +168,7 @@
 	 */
 	public final static String SYSTEMSETTING_FOREIGN_TOUSSE_PROCESS_TYPE = "foreignTousseProcessType";
 	
-	private long id;
+	private Long id;
 	
 	private String optionText;
 	
@@ -191,11 +191,11 @@
 	
 	@Id
 	@GeneratedValue(strategy=GenerationType.AUTO)
-	public long getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(long id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
===================================================================
diff -u -r18260 -r19212
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java	(.../HttpOptionManagerSSTSImpl.java)	(revision 18260)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java	(.../HttpOptionManagerSSTSImpl.java)	(revision 19212)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.systemsetting.service;
 
+import java.math.MathContext;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -35,14 +36,16 @@
 		super(HttpOption.class);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public List<HttpOption> getHttpOptionListById(String listId) {
 		String sql = " where po.optionListId = '" + listId
 				+ "' ORDER BY po.sequence";
-		return (List<HttpOption>) objectDao.findBySql(HttpOption.class
+		return objectDao.findBySql(HttpOption.class
 				.getSimpleName(), sql);
 	}
 
+	@Override
 	public List<String> getHttpOptionTextById(String listId) {
 		List<String> optionText = new ArrayList<String>();
 		List<HttpOption> optionList = this.getHttpOptionListById(listId);
@@ -51,11 +54,13 @@
 		}
 		return optionText;
 }
+	@Override
 	public List<String> getHttpOptionValuesByListIdId(String listId){
 		String hql = String.format(" select po.optionValue from %s po where po.optionListId ='%s'",HttpOption.class.getSimpleName(), listId);
-		return (List<String>)objectDao.findByHql(hql);
+		return objectDao.findByHql(hql);
 	}
 	
+	@Override
 	public Map<String,String> getHttpOptionTextToValueMapByListIdId(String listId){
 		Map<String,String> map = new HashMap<String, String>();
 		List<HttpOption> optionList = this.getHttpOptionListById(listId);
@@ -73,6 +78,7 @@
 	 * 包装类型表定在
 	 * @return
 	 */
+	@Override
 	public List<List<Object>> getPackageTypeAndExpirationDateInfo(){
 		List<List<Object>> packageTypeList = new ArrayList<List<Object>>();
 		String sql = "select ho.optionText,ed.validDate,ed.validDateUnit,ed.warningDate from HttpOption ho "
@@ -109,6 +115,7 @@
 		return packageTypeList;
 	}
 
+	@Override
 	public String saveOrUpdateTextByListId(List<String> optionList, String listId) {
 		String message = "保存成功！";
 		// 判断是否允许删除
@@ -129,13 +136,14 @@
 		return message;
 	}
 	
+	@Override
 	public String saveOrUpdateByJsonAndListId(String jsonOptionList, String listId){
 		JSONArray jsonArray = JSONArray.fromObject(jsonOptionList);
 		List<HttpOption> optionList = new LinkedList<HttpOption>();
 		for(int i=0;i<jsonArray.size();++i){
 			JSONObject obj = jsonArray.getJSONObject(i);
 			HttpOption httpOption = new HttpOption();
-			httpOption.setId(JSONUtil.optInt(obj, "id", 0));
+			httpOption.setId(JSONUtil.optLong(obj, "id", 0L));
 			httpOption.setOptionListId(listId);
 			httpOption.setOptionText(JSONUtil.optString(obj, "optionText", ""));
 			httpOption.setOptionValue(JSONUtil.optString(obj, "optionValue", ""));
@@ -205,14 +213,15 @@
 		return isDelete;
 	}
 
+	@Override
 	public String saveOrUpdateByListId(List<HttpOption> optionList, String listId) {
 		String message = "保存成功！";
 		List<HttpOption> dbList = getHttpOptionListById(listId);
 		
 		// 处理修改
 		for (HttpOption dbHttpOption : dbList) {
 			for (HttpOption submitHttpOption : optionList) {
-				if(dbHttpOption.getId() == submitHttpOption.getId()){
+				if(dbHttpOption.getId() != null && submitHttpOption.getId() != null && dbHttpOption.getId().longValue() == submitHttpOption.getId().longValue()){
 					synchronizeModification(dbHttpOption, submitHttpOption, listId);
 				}
 			}
@@ -221,7 +230,7 @@
 		objectDao.deleteAll(dbList);
 		// 保存
 		for (HttpOption httpOption : optionList) {
-			httpOption.setId(0);// 全部重新保存
+			httpOption.setId(0L);// 全部重新保存
 			saveOrUpdate(httpOption);
 		}
 		return message;
@@ -233,25 +242,35 @@
 			return;
 		}
 		switch(listId){
-		case HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE:
-			String sql = String.format(" update %s set type='%s' where type='%s'", DisposableGoods.class.getSimpleName(),submitText,dbText);
-			String sql2 = String.format(" update %s set type='%s' where type='%s'", DisposableGoodsStock.class.getSimpleName(),submitText,dbText);
-			objectDao.executeUpdate(sql);
-			objectDao.executeUpdate(sql2);
-			break;
+			case HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE:
+				String sql = String.format(" update %s set type='%s' where type='%s'", DisposableGoods.class.getSimpleName(),submitText,dbText);
+				String sql2 = String.format(" update %s set type='%s' where type='%s'", DisposableGoodsStock.class.getSimpleName(),submitText,dbText);
+				objectDao.executeUpdate(sql);
+				objectDao.executeUpdate(sql2);
+				break;
+			case HttpOption.SYSTEMSETTING_PACKAGING_TYPE:
+				sql = String.format(" update %s set packageType='%s' where packageType='%s'", TousseDefinition.class.getSimpleName(),submitText,dbText);
+				objectDao.executeUpdate(sql);
+				break;
 		}
 	}
+	@Override
 	public void saveOrUpdate(HttpOption httpOption) {
 		if (httpOption != null) {
+			if(!DatabaseUtil.isPoIdValid(httpOption.getId())){
+				httpOption.setId(null);
+			}
 			objectDao.saveOrUpdate(httpOption);
 		}
 	}
 
+	@Override
 	public String getHttpOptionTitle(String optionId) {
 		String name = getHttpOptionName(optionId);
 		return name+"设置";
 	}
 
+	@Override
 	public String getHttpOptionName(String optionId){
 
 
@@ -288,13 +307,15 @@
 	
 	}
 	
+	@Override
 	public String getHttpOptionNameTitle(String listId) {
 		if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
 			return "名称";
 		}
 		return "名称";
 	}
 
+	@Override
 	public String getHttpOptionValueTitle(String listId) {
 		if(StringUtils.isBlank(listId)){
 			return "值";
@@ -309,6 +330,7 @@
 		return "值";
 	}
 
+	@Override
 	public String getHttpOptionRemark(String listId) {
 		if (listId.equals(HttpOption.SYSTEMSETTING_CONSTANT)) {
 			return "";
@@ -333,6 +355,7 @@
 		return max ;
 	}
 	
+	@Override
 	public boolean isListChange(List<String> optionList, String listId)
 	{
 		List<HttpOption> httpOptionList = this.getHttpOptionListById(listId);
@@ -376,6 +399,7 @@
 	 * 获取科室分组里面的所有科室
 	 * @return
 	 */
+	@Override
 	public List<String> getDepartsFromDepartGroup(){
 		List<String> list = new ArrayList<String>();
 		List<HttpOption> hos =  getHttpOptionListById(HttpOption.SYSTEMSETTING_DEPARTMENT_GROUP);
@@ -401,6 +425,7 @@
 	 * 获取分组名称和里面科室的map
 	 * @return
 	 */
+	@Override
 	public Map<String,List<String>> getGroupAndDepartMap(){
 		Map<String,List<String>> map = new HashMap<String,List<String>>();
 		List<HttpOption> hos =  getHttpOptionListById(HttpOption.SYSTEMSETTING_DEPARTMENT_GROUP);