Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml
===================================================================
diff -u -r36709 -r37104
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml	(.../applicationContext-his-gyey.xml)	(revision 36709)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml	(.../applicationContext-his-gyey.xml)	(revision 37104)
@@ -107,7 +107,7 @@
     </bean>
     
     <!-- 主要查病人信息，不包含手术信息 -->
-   <!-- <bean id="findPatientInfoByHospitalNumDao3" class="com.forgon.disinfectsystem.datasynchronization.dao.gyey.FindPatientInfoByHospitalNumDaoImpl" /> -->
+	<bean id="findPatientInfoByHospitalNumDao3" class="com.forgon.disinfectsystem.datasynchronization.dao.gyey.FindPatientInfoByHospitalNumDaoImpl" />
     
     <!-- 诊疗号病人接口 -->
     <!--<bean id="findPatientInfoByTreatmentNumDao"  --><!--class="com.forgon.disinfectsystem.datasynchronization.dao.gyey.FindPatientInfoByTreatmentNumDaoImpl"/> -->
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByTreatmentNumDaoImpl.java
===================================================================
diff -u -r34411 -r37104
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByTreatmentNumDaoImpl.java	(.../FindPatientInfoByTreatmentNumDaoImpl.java)	(revision 34411)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByTreatmentNumDaoImpl.java	(.../FindPatientInfoByTreatmentNumDaoImpl.java)	(revision 37104)
@@ -20,12 +20,14 @@
 			String inputXml = WebServiceClientHelper.buildInputString(DatasyncConstant.UserTypeMZ, treatmentNum);
 			logger.info("门诊号信息查询服务接口地址：" + DatasyncConstant.PatientInfoQueryWebserviceAddress);
 			logger.info("门诊号查询接口请求信息：" + inputXml);
-			String result;
-			result = WebServiceClientHelper.doPostSoap1_2(DatasyncConstant.PatientInfoQueryWebserviceAddress, inputXml);
-			//result = "<Res><resultCode>0</resultCode><resultDesc>成功</resultDesc><userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList></Res>";
+			String result = WebServiceClientHelper.doPostSoap1_2(DatasyncConstant.PatientInfoQueryWebserviceAddress, inputXml);
+			/*String result = "<Res><resultCode>0</resultCode><resultDesc>成功</resultDesc>"
+					+ "<userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList>"
+					+ "<userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList>"
+					+ "</Res>";*/
 			logger.info("门诊号查询接口返回信息：" + result);
 			//解析xml获取患者手术单信息
-			PatientInfoVO[] patientInfoVOs = WebServiceClientHelper.getPatientInfoByXML(result);
+			PatientInfoVO[] patientInfoVOs = WebServiceClientHelper.getPatientInfoByXML(DatasyncConstant.UserTypeMZ, result);
 			return patientInfoVOs;
 		} catch (Exception e) {
 			logger.error("查询失败" + e);
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java
===================================================================
diff -u -r34433 -r37104
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 34433)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 37104)
@@ -1,10 +1,13 @@
 package com.forgon.disinfectsystem.datasynchronization.dao.gyey;
 
 import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -68,7 +71,7 @@
 	 * @param responce
 	 * @return
 	 */
-	public static PatientInfoVO[] getPatientInfoByXML(String responce) {
+	public static PatientInfoVO[] getPatientInfoByXML(String useType, String responce) {
 		if(StringUtils.isBlank(responce)){
 			return null;
 		}
@@ -81,38 +84,63 @@
 		responce = responce.substring(beginIndex, endIndex + "</Res>".length());
 		
 		PatientInfoVO[] patientInfoVOArray = null;
+		List<PatientInfoVO> patientInfoVOList = new ArrayList<PatientInfoVO>();
 		JSONObject documentElementJsonObject = (JSONObject)CssdUtils.xml2JsonCommon(responce);
 		if(documentElementJsonObject != null){
 			String code = documentElementJsonObject.optString("resultCode");
 			if(DatasyncConstant.ResultCodeSuccess.equals(code)){
 				Object patientInfoObj = documentElementJsonObject.opt("userList");
-				JSONObject patientInfo = null;
+				JSONArray patientInfoArray = new JSONArray();
 				//body下节点可能会有多个userList节点,所以需要判断
 				if(patientInfoObj instanceof JSONObject){
-					patientInfo = (JSONObject)patientInfoObj;
+					JSONObject patientInfo = (JSONObject)patientInfoObj;
+					patientInfoArray.add(patientInfo);
 				}else if(patientInfoObj instanceof JSONArray){
-					patientInfo = ((JSONArray)patientInfoObj).optJSONObject(0);
+					patientInfoArray = ((JSONArray)patientInfoObj);
 				}
-				if(patientInfo == null){
+				if(patientInfoArray == null || patientInfoArray.size() == 0){
 					return null;
 				}
-				String tNumber = patientInfo.optString("hospitalNumber");
-				String patientName = patientInfo.optString("name");
-				String patientAge = patientInfo.optString("age");
-				String patientSex = patientInfo.optString("sex");
-				String patientIDCard = patientInfo.optString("idNumber");
-				String doctorName = patientInfo.optString("F_YSXM");
-
-				PatientInfoVO vo = new PatientInfoVO();
-				vo.setPatientNumber(tNumber);
-				vo.setHospitalNumber(vo.getPatientNumber());
-				vo.setPatientName(patientName);
-				vo.setPatientAge(patientAge == null ? "" : patientAge.replace("Y", "").replace("y", ""));
-				vo.setPatientSex(patientSex);
-				vo.setPatientIDCard(patientIDCard);
-				vo.setDoctorName(doctorName);
-
-				patientInfoVOArray = new PatientInfoVO[] { vo };
+				for (int i=0;i<patientInfoArray.size();i++) {
+					JSONObject patientInfo = patientInfoArray.getJSONObject(i);
+					String tNumber = patientInfo.optString("patientNo");
+					String patientName = patientInfo.optString("name");
+					String patientAge = patientInfo.optString("age");
+					String patientSex = patientInfo.optString("sex");
+					String patientIDCard = patientInfo.optString("idNumber");
+					String doctorName = patientInfo.optString("F_YSXM");
+					String patientArea = patientInfo.optString("F_BMMC");
+					String ascriptionDepartment = patientInfo.optString("F_BMMC");
+					String roomNumber = patientInfo.optString("F_BMMC");
+					String operationScheduleId = patientInfo.optString("F_DCMZID");
+					
+					PatientInfoVO vo = new PatientInfoVO();
+					vo.setPatientNumber(tNumber);
+					if(StringUtils.equals(useType, DatasyncConstant.UserTypeZY)){
+						vo.setHospitalNumber(tNumber);
+					}else if(StringUtils.equals(useType, DatasyncConstant.UserTypeMZ)){
+						vo.setClinicNumber(tNumber);
+					}
+					vo.setPatientName(patientName);
+					vo.setPatientAge(patientAge == null ? "" : patientAge.replace("Y", "").replace("y", ""));
+					vo.setPatientSex(patientSex);
+					vo.setPatientIDCard(patientIDCard);
+					vo.setDoctorName(doctorName);
+					//GYEY-811 病人信息接口新增字段
+					vo.setPatientArea(patientArea);
+					vo.setAscriptionDepartment(ascriptionDepartment);
+					vo.setRoomNumber(roomNumber);
+					vo.setOperationScheduleId(operationScheduleId);
+					
+					patientInfoVOList.add(vo);
+				}
+				if(CollectionUtils.isNotEmpty(patientInfoVOList)){
+					patientInfoVOArray = new PatientInfoVO[patientInfoVOList.size()];
+					for (int i=0;i<patientInfoVOList.size();i++) {
+						PatientInfoVO vo = patientInfoVOList.get(i);
+						patientInfoVOArray[i] = vo;
+					}
+				}
 			}else{
 				throw new RuntimeException(documentElementJsonObject.optString("resultDesc"));
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml
===================================================================
diff -u -r27973 -r37104
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml	(.../FindPatientInfoByHospitalNumLocalDataMapper.xml)	(revision 27973)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumLocalDataMapper.xml	(.../FindPatientInfoByHospitalNumLocalDataMapper.xml)	(revision 37104)
@@ -8,16 +8,22 @@
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
 	SELECT h.hospitalNumber as patientNumber,
+			h.hospitalNumber as hospitalNumber,
+	        h.washHandNurse as washHandNurse,
+	        h.circuitNurse as circuitNurse,
+	        h.operationRoom as opRoomId,
         	h.patientName as patientName,
 	        h.patientAge as patientAge,
 	        h.patientSex as patientSex,
-	        h.patientIDCard as patientIDCard,
-	        h.doctorName as doctorName,
+	        h.patientArea as patientArea,
+	        h.roomNumber as ascriptionDepartment,
 	        h.roomNumber as roomNumber,
 	        h.bedNumber as bedNumber,
-	        h.patientArea as patientArea,
-	        h.visitAmount as visitId,
-	        h.surgeryName as operation
+	        h.patientIDCard as patientIDCard,
+	        h.doctorName as doctorName,
+	        h.surgeryName as operation,
+	        h.hospitalSerialNumber as operationScheduleId,
+	        h.visitAmount as visitId
 	FROM PatientAdmissionInfo as h
 	WHERE h.hospitalNumber = #{hospitalNum}
 	and h.surgeryName is not null
@@ -30,16 +36,21 @@
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
 	SELECT h.hospitalNumber as patientNumber,
+	        h.washHandNurse as washHandNurse,
+	        h.circuitNurse as circuitNurse,
+	        h.operationRoom as operationRoom,
         	h.patientName as patientName,
 	        h.patientAge as patientAge,
 	        h.patientSex as patientSex,
-	        h.patientIDCard as patientIDCard,
-	        h.doctorName as doctorName,
+	        h.patientArea as patientArea,
+	        h.roomNumber as ascriptionDepartment,
 	        h.roomNumber as roomNumber,
 	        h.bedNumber as bedNumber,
-	        h.patientArea as patientArea,
-	        h.visitAmount as visitId,
-	        h.surgeryName as operation
+	        h.patientIDCard as patientIDCard,
+	        h.doctorName as doctorName,
+	        h.surgeryName as operation,
+	        h.hospitalSerialNumber as operationScheduleId,
+	        h.visitAmount as visitId
 	FROM PatientAdmissionInfo as h
 	WHERE h.hospitalNumber = #{hospitalNum}
 	and h.surgeryName is not null
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByHospitalNumDaoImpl.java
===================================================================
diff -u -r34411 -r37104
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByHospitalNumDaoImpl.java	(.../FindPatientInfoByHospitalNumDaoImpl.java)	(revision 34411)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/FindPatientInfoByHospitalNumDaoImpl.java	(.../FindPatientInfoByHospitalNumDaoImpl.java)	(revision 37104)
@@ -21,12 +21,14 @@
 			String inputXml = WebServiceClientHelper.buildInputString(DatasyncConstant.UserTypeZY, hospitalNum);
 			logger.info("住院号信息查询服务接口地址：" + DatasyncConstant.PatientInfoQueryWebserviceAddress);
 			logger.info("住院号查询接口请求信息：" + inputXml);
-			String result;
-			result = WebServiceClientHelper.doPostSoap1_2(DatasyncConstant.PatientInfoQueryWebserviceAddress, inputXml);
-			//result = "<Res><resultCode>0</resultCode><resultDesc>成功</resultDesc><userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList></Res>";
+			String result = WebServiceClientHelper.doPostSoap1_2(DatasyncConstant.PatientInfoQueryWebserviceAddress, inputXml);
+			/*String result = "<Res><resultCode>0</resultCode><resultDesc>成功</resultDesc>"
+					+ "<userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList>"
+					+ "<userList><name>戴*芬</name><sex>女</sex><age>Y31</age><birthday>1991-12-08 00:00:00.000</birthday>   <idNumber>360733********4121</idNumber><phone>1867*****208</phone><patientNo>800789520</patientNo><diagnosis/><dedicalTypes>自费</dedicalTypes><F_BRRYSJ/><F_YLZH/><F_XZSS/><F_XZDS/><F_XZXQ/><F_XZJD/><F_XZCM/><F_XZDZ>江西省赣州市*****元1101</F_XZDZ><F_YZBM/><F_FYZK/><F_BRMZ/><F_BRZY/><F_GZDW/><F_ZZDH>18679*****8</F_ZZDH><F_JKKH/><F_FKJGDM/><F_DABH/><F_JDJGDM/><F_LXRGX>监护人</F_LXRGX><F_LXRDH/><F_LXRXM/><F_DJJGDM>455344213</F_DJJGDM><F_DJJGMC>广州医科大学附属第二医院</F_DJJGMC><F_YLGJDM/><F_CZID/><F_BRCYSJ/><F_DCMZID>14****404</F_DCMZID><F_BMID>3103</F_BMID><F_BMMC>疼痛科(门)</F_BMMC><F_YSID>003052</F_YSID><F_YSXM>万丽</F_YSXM><MPI_NO/></userList>"
+					+ "</Res>";*/
 			logger.info("住院号查询接口返回信息：" + result);
 			//解析xml获取患者手术单信息
-			PatientInfoVO[] patientInfoVOs = WebServiceClientHelper.getPatientInfoByXML(result);
+			PatientInfoVO[] patientInfoVOs = WebServiceClientHelper.getPatientInfoByXML(DatasyncConstant.UserTypeZY, result);
 			return patientInfoVOs;
 		} catch (Exception e) {
 			logger.error("查询失败" + e);
Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r27973 -r37104
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 27973)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 37104)
@@ -8,12 +8,17 @@
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
 	SELECT h.hospitalNumber as patientNumber,
+			h.hospitalNumber as hospitalNumber,
         	h.patientName as patientName,
 	        h.patientAge as patientAge,
 	        h.patientSex as patientSex,
+	        h.inpatientArea as patientArea,
+	        h.inpatientArea as ascriptionDepartment,
 	        h.patientIDCard as patientIDCard,
 	        h.doctorName as doctorName,
-	        h.operation as operation
+	        h.operation as operation,
+	        h.SerialNumber as operationScheduleId,
+	        convert(varchar,h.operationTime,120) operationTime
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
     ORDER BY h.serialNumber DESC, h.operationTime DESC
@@ -24,12 +29,17 @@
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
 	SELECT h.hospitalNumber as patientNumber,
+			h.hospitalNumber as hospitalNumber,
         	h.patientName as patientName,
 	        h.patientAge as patientAge,
 	        h.patientSex as patientSex,
+	        h.inpatientArea as patientArea,
+	        h.inpatientArea as ascriptionDepartment,
 	        h.patientIDCard as patientIDCard,
 	        h.doctorName as doctorName,
-	        h.operation as operation
+	        h.operation as operation,
+	        h.SerialNumber as operationScheduleId,
+	        convert(varchar,h.operationTime,120) operationTime
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
     ORDER BY h.serialNumber DESC, h.operationTime DESC