Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationreservation/service/OperationReservationWebServiceImpl.java
===================================================================
diff -u -r33603 -r33619
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationreservation/service/OperationReservationWebServiceImpl.java	(.../OperationReservationWebServiceImpl.java)	(revision 33603)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationreservation/service/OperationReservationWebServiceImpl.java	(.../OperationReservationWebServiceImpl.java)	(revision 33619)
@@ -35,6 +35,7 @@
 import com.forgon.tools.GB2Alpha;
 import com.forgon.tools.GB2WB;
 import com.forgon.tools.date.DateTools;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 
 public class OperationReservationWebServiceImpl implements OperationReservationWebService {
@@ -112,12 +113,15 @@
 			//手术名称
 			String operationNameXpath = rootXpath + "/s:opeationCode/s:displayName/@value";
 			String operationName = processDataByXpath(document, nameSpaceURIMap, operationNameXpath);
-			//申请科室
-			String departXpath = rootXpath + "/s:location/s:serviceDeliveryLocation/s:addr/s:item/s:part/@value";
+			//申请科室：科室名称叫：手术室西侧楼    科室编码：580104
+			/*String departXpath = rootXpath + "/s:location/s:serviceDeliveryLocation/s:addr/s:item/s:part/@value";
 			String depart = processDataByXpath(document, nameSpaceURIMap, departXpath);
 			String departCodingXpath = rootXpath + "/s:location/s:serviceDeliveryLocation/s:id/s:item/@extension";
-			String departCoding = processDataByXpath(document, nameSpaceURIMap, departCodingXpath);
+			String departCoding = processDataByXpath(document, nameSpaceURIMap, departCodingXpath);*/
 			
+			//申请科室，北京大学肿瘤医院手术预约单申请科室固定为"手术室西侧楼"，不取请求信息中的执行科室
+			String depart = "手术室西侧楼";
+			String departCoding = "580104";
 			List<OrgUnit> orgUnitList = objectDao.findByProperty(OrgUnit.class.getSimpleName(), "orgUnitCoding", departCoding);
 			if(CollectionUtils.isEmpty(orgUnitList)){
 				throw new SystemException("不存在科室编码为：" + departCoding + ",科室名称为：“" + depart + "”的科室！");
@@ -194,7 +198,7 @@
 			operationReservation.setOperationRoom(operatingRoom);
 			operationReservation.setDoctors(doctors);
 			if (StringUtils.isNotBlank(operationTimeString)) {
-				Date operationTime = DateTools.coverStrToDate(operationTimeString, "yyyyMMddHHmmss");
+				Date operationTime = DateTools.coverStrToDate(operationTimeString, "yyyy/MM/dd HH:mm:ss");
 				operationReservation.setOperationTime(operationTime);
 			}
 			operationReservation.setDepart(depart);
@@ -225,9 +229,11 @@
 			operationReservation.setSpelling(GB2Alpha.string2Alpha(depart));
 			operationReservation.setWbCode(GB2WB.getWBCode(depart));
 			operationReservation.setRecyclingStatus(null);
-			operationReservation.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
-			operationReservation.setType(InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION);
-			operationReservation.setIncludeInvoiceItems(InvoicePlan.SIGNED_TRUE);
+			if(!DatabaseUtil.isPoIdValid(operationReservation.getId())){
+				operationReservation.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
+				operationReservation.setType(InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION);
+				operationReservation.setIncludeInvoiceItems(InvoicePlan.SIGNED_TRUE);
+			}
 			if(StringUtils.isBlank(operationReservation.getSerialNumber())){
 				operationReservation.setSerialNumber("SYNC_" + serialNumManager
 						.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION));