=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-01-31 06:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2012-03-01 07:16:15 +0000
@@ -718,7 +718,7 @@
 		<action name="getPSDataElements"
 			class="org.hisp.dhis.patient.action.caseaggregation.GetPSDataElementsAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseAggDataElement.vm
+				/dhis-web-maintenance-patient/responsePSDataElements.vm
 			</result>
 		</action>
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm	2012-02-14 03:37:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseAggDataElement.vm	2012-03-01 07:16:15 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataelements>
-	#foreach( $dataElement in $dataElementList )
+	#foreach( $ocName in $optionComboNames )
+	#set( $count = $velocityCount - 1 )
 		<dataelement>
-			<id>[DE:$psId.$dataElement.id]</id>
-			<name>$encoder.xmlEncode( $dataElement.name )</name>
-			<optionset>$!dataElement.optionSet.options</optionset>
+  			<id>$optionComboIds.get($count)</id>
+  			<name>$encoder.xmlEncode( $ocName )</name>
 		</dataelement>	
 	#end
 </dataelements>
\ No newline at end of file

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responsePSDataElement.vm	2012-03-01 07:16:15 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataelements>
+	#foreach( $dataElement in $dataElementList )
+		<dataelement>
+			<id>[DE:$psId.$dataElement.id]</id>
+			<name>$encoder.xmlEncode( $dataElement.name )</name>
+			<optionset>$encoder.xmlEncode( $dataElement.optionSet.options )</optionset>
+		</dataelement>	
+	#end
+</dataelements>
\ No newline at end of file