Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r32639 -r32707
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 32639)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 32707)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.foreigntousseapplication.service;
 
+import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -45,6 +46,8 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile;
 import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
+import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseChargeMode;
+import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseSpecification;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
@@ -2215,5 +2218,44 @@
 		}
 		return result;
 	}
-
+	@Override
+	public JSONArray queryChargingModeStore() {
+		ResultSet rs = null;
+		JSONArray arr = new JSONArray();
+		try {
+			String sql = "select id \"id\",name \"name\" from " + ForeignTousseChargeMode.class.getSimpleName();
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				JSONObject obj = new JSONObject();
+				obj.put("id", rs.getLong("id"));
+				obj.put("name", rs.getString("name"));
+				arr.add(obj);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return arr;
+	}
+	@Override
+	public JSONArray queryForeignTousseSpecificationStore() {
+		ResultSet rs = null;
+		JSONArray arr = new JSONArray();
+		try {
+			String sql = "select id \"id\",name \"name\" from " + ForeignTousseSpecification.class.getSimpleName();
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				JSONObject obj = new JSONObject();
+				obj.put("id", rs.getLong("id"));
+				obj.put("name", rs.getString("name"));
+				arr.add(obj);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return arr;
+	}
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r32572 -r32707
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 32572)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 32707)
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -711,5 +710,34 @@
 			StrutsResponseUtils.output(result);
 		}
 	}
-	
+	/**
+	 * 查询收费模式
+	 */
+	public void queryChargingModeStore(){
+		JSONObject obj = new JSONObject();
+		try {
+			obj.put("data", foreignTousseApplicationManager.queryChargingModeStore());
+			obj.put("success", true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			obj.put("success", false);
+			obj.put("msg",e.getMessage());
+		}
+		StrutsResponseUtils.output(obj);
+	}
+	/**
+	 * 查询外来器械收费规格设置
+	 */
+	public void queryForeignTousseSpecificationStore(){
+		JSONObject obj = new JSONObject();
+		try {
+			obj.put("data", foreignTousseApplicationManager.queryForeignTousseSpecificationStore());
+			obj.put("success", true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			obj.put("success", false);
+			obj.put("msg",e.getMessage());
+		}
+		StrutsResponseUtils.output(obj);
+	}
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
===================================================================
diff -u -r31795 -r32707
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java	(.../ForeignTousseApplicationManager.java)	(revision 31795)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java	(.../ForeignTousseApplicationManager.java)	(revision 32707)
@@ -99,5 +99,15 @@
 	 * @param applicationId 外来器械申请单id
 	 */
 	public JSONObject checkForeignTousseApplicationSplitTousse(String applicationId);
+	/**
+	 * 查询外来器械收费模式
+	 * @return
+	 */
+	public JSONArray queryChargingModeStore();
+	/**
+	 *  查询外来器械收费规格设置
+	 * @return
+	 */
+	public JSONArray queryForeignTousseSpecificationStore();
 
 }