Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java
===================================================================
diff -u -r33807 -r34275
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java	(.../ForeignTousseWebServiceExImpl.java)	(revision 33807)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java	(.../ForeignTousseWebServiceExImpl.java)	(revision 34275)
@@ -99,6 +99,8 @@
 				
 				// 广东省中医院的参数(GDSZYY-75)
 				String surgeryCodeXpath = "/param/SURGERYCODE";
+				//由望海系统推送一个新的“手术名称”字段，在手术名称后拼接手术部位(GDSZYY-175)
+				String surgeryNameXpath = "/param/SURGERYNAME";
 				String surgeryDepartCodeXpath = "/param/SURGERY_DEPART_CODE";
 				String surgeryDepartXpath = "/param/SURGERY_DEPART";
 				String remarkXpath = "/param/REMARK";
@@ -312,6 +314,8 @@
 					appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的submitForeignTousseApplication方法,返回结果=" + returnJSONObject);
 					return xmlSerializer.write(returnJSONObject);
 				}
+				//手术名称：手术名称字段不为空，则不需要取住院号接口的患者手术名称(GDSZYY-175)
+				String surgery = processDataByXpath(document, surgeryNameXpath);
 				ForeignTousseApplication orginalForeignTousseApplication = foreignTousseApplicationManager.getFirst("serialNumber='"+ serialNumber +"'");
 				//调用外来器械申请单业务方法
 				ForeignTousseApplication foreignTousseApplication = null;
@@ -358,7 +362,12 @@
 							foreignTousseApplication.setOperationTime(ForgonDateUtils.safelyParseDate(patientInfoVOs[0].getOperationTime()));
 						}
 						foreignTousseApplication.setRoomNumber(patientInfoVOs[0].getRoomNumber());
-						foreignTousseApplication.setSurgery(patientInfoVOs[0].getOperation());
+						if(StringUtils.isNotBlank(surgery)){
+							//SURGERYNAME手术名称字段不为空，则不需要取住院号接口的患者手术名称(GDSZYY-175)
+							foreignTousseApplication.setSurgery(surgery);
+						}else{
+							foreignTousseApplication.setSurgery(patientInfoVOs[0].getOperation());
+						}
 						foreignTousseApplication.setOperationPart(patientInfoVOs[0].getOperationPart());
 					}
 					foreignTousseApplication.setPackageStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE);
@@ -410,7 +419,12 @@
 							}
 							orginalForeignTousseApplication.setRoomNumber(patientInfoVOs[0].getRoomNumber());
 							orginalForeignTousseApplication.setBedNumber(patientInfoVOs[0].getBedNumber());
-							orginalForeignTousseApplication.setSurgery(patientInfoVOs[0].getOperation());
+							if(StringUtils.isNotBlank(surgery)){
+								//SURGERYNAME手术名称字段不为空，则不需要取住院号接口的患者手术名称(GDSZYY-175)
+								orginalForeignTousseApplication.setSurgery(surgery);
+							}else{
+								orginalForeignTousseApplication.setSurgery(patientInfoVOs[0].getOperation());
+							}
 							orginalForeignTousseApplication.setOperationPart(patientInfoVOs[0].getOperationPart());
 						}
 					}