Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r12574 -r12597
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 12574)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 12597)
@@ -507,6 +507,10 @@
 							item.setDiposable("否");
 							item.setTousseDefinitionId(td.getId());
 							item.setExpressRecycling(td.getExpressRecycling());
+							item.setIsApplyEntireTousse(td.getIsApplyEntireTousse());
+							item.setIsCleanedEntirely(td.getIsCleanedEntirely());
+							boolean isThereIDCard = tousseDefinitionManager.isThereIDCard(td);
+							item.setIsThereIdentificationCard(isThereIDCard?"是":"否");
 							// 器械包取器械包定义中的价格
 							double price = td.getPrice();
 							// 消毒物品取材料的消毒价格之和
@@ -2079,7 +2083,7 @@
 
 		if (SterilizationRecord.STERILIZATION_STATUS_END.equals(status)) {
 			sterilizationRecordManager.completeSterilization(sterileRecordIds,
-					departCode);
+					departCode,null);
 		} else if (SterilizationRecord.STERILIZATION_STATUS_FAILURE
 				.equals(status)) {
 			sterilizationRecordManager
@@ -2981,18 +2985,7 @@
 		}catch(Throwable e){
 			System.out.println(e);
 		}
-		if(StringUtils.isBlank(type)){
-			type="clientForAndroid";
-		}
-		String webInfoPath = Path.getWebAppRoot();
-		String path = webInfoPath;
-		if(webInfoPath != null){
-			int end = webInfoPath.indexOf("WEB-INF");
-			if( end != -1){
-				path = webInfoPath.substring(0,end - 1);
-			}
-		}
-		String mobileClientInfoFilePath = path + "/mobileClient/" + type + ".json";
+		String mobileClientInfoFilePath = Path.getMobileClientInfoFilePath(type);
 		
 		String mobileClientInfo = null;
 		if(FileUtils.fileExist(mobileClientInfoFilePath)){
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
===================================================================
diff -u -r12562 -r12597
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 12562)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 12597)
@@ -1384,7 +1384,6 @@
 
 			sterilizationRecord.setSterilizationUser(record
 					.getSterilizationUser());
-
 			sterilizationRecord.setSterilizer(sterilizer);
 			sterilizationRecord.setSterilizationType(record
 					.getSterilizationType());
@@ -2304,4 +2303,21 @@
 		return mobileClientInfo;
 	}
 
+	@Override
+	public String signTousseInstance(String jsonParamStr) {
+		JSONObject params = JSONObject.fromObject(jsonParamStr);
+		String barcode = params.getString("barcode");
+		String departCoding = params.getString("departCoding");
+		String receiver = params.getString("receiver");
+		return tousseInstanceManager.singTousseInstanceByBarcode(barcode, departCoding, receiver);
+	}
+
+	@Override
+	public String getTodaySignedTousseInstance(String jsonParamStr) {
+		JSONObject params = JSONObject.fromObject(jsonParamStr);
+		String departName = params.getString("departName");
+		String departCoding = params.getString("departCoding");
+		return tousseInstanceManager.getTodaySignedTousseInstance(departCoding, departName);
+	}
+
 }
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java
===================================================================
diff -u -r12532 -r12597
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java	(.../WebServiceManager.java)	(revision 12532)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManager.java	(.../WebServiceManager.java)	(revision 12597)
@@ -136,4 +136,16 @@
 	public String getUseRecordOfAwaitForRecycle(@WebParam(name = "patientNum")String patientNum, @WebParam(name = "numType")String numType);
 	
 	public String getMobileClientInfo();
+	/**
+	 * 签收器械包。根据条码及签收人和签收人的科室编码签收
+	 * @param jsonParamStr 包括器械包条码及签收人和签收人科室编码的json参数
+	 * @return 返回签收的执行结果
+	 */
+	public String signTousseInstance(@WebParam(name = "jsonParams") String jsonParamStr);
+	/**
+	 * 获取指定科室当天签收的所有器械包
+	 * @param jsonParamStr 包括科室编码及科室名称的json参数
+	 * @return 返回当天签收的所有器械包及数量和总数量
+	 */
+	public String getTodaySignedTousseInstance(@WebParam(name = "jsonParams") String jsonParamStr);
 }
Fisheye: Tag 12597 refers to a dead (removed) revision in file `ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/test/LogonTest.java'.
Fisheye: No comparison available.  Pass `N' to diff?