=== modified file 'dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java	2014-01-21 09:34:09 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java	2014-01-21 09:43:33 +0000
@@ -271,7 +271,17 @@
                 }
 
                 Service service = new Service();
-                service.setOid( dataSet.getCode() );
+                service.setOid( "No oid, please provide service_oid attribute value." );
+
+                for ( AttributeValue attributeValue : dataSet.getAttributeValues() )
+                {
+                    if ( attributeValue.getAttribute().getName().equals( "service_oid" ) )
+                    {
+                        service.setOid( attributeValue.getValue() );
+                        break;
+                    }
+                }
+
                 service.getNames().add( new Name( new CommonName( dataSet.getDisplayName() ) ) );
 
                 organization.getServices().add( service );