OpenMRS

Timestamp:

07/02/08 19:40:36 (5 months ago)

Author:

bmckown

Message:

Merging trunk to complex-obs [4379][4764]

Files:

• openmrs/branches/complex-obs/src/api/org/openmrs/api/ObsService.java (modified) (3 diffs)

openmrs/branches/complex-obs/src/api/org/openmrs/api/ObsService.java

@@ -303 +303 @@
-        /**
-         * @see {@link org.openmrs.Person#getObservations()}
-the method on the org.openmrs.Person for getObservations
+{@link #getObservationsByPerson(Person)}
-         */
-        @Transactional(readOnly = true)
@@ -310 +310 @@
-
-        /**
-
+
+
+
-         * 
-         * @param who the user to match on
@@ -375 +377 @@
-        
-        /**
-(List, List, List, org.openmrs.api.ObsService.PERSON_TYPE, Location, String, Integer, Integer, Date, Date, boolean
+ByPersonAndConcept(Person, Concept
-         */
-        @Transactional(readOnly = true)
-        @Authorized(OpenmrsConstants.PRIV_VIEW_OBS)
-        public Set<Obs> getObservations(Person who, Concept question, boolean includeVoided);
+        
+        /**
+         * Get all nonvoided observations for the given patient with the given
+         * concept as the question concept (conceptId)
+         * 
+         * @param who person to match on
+         * @param question conceptId to match on
+         * @return list of all nonvoided observations matching these criteria
+         * @throws APIException
+         * @see {@link #getObservations(List, List, List, List, List, List, List, Integer, Integer, Date, Date, boolean)}
+         */
+        public List<Obs> getObservationsByPersonAndConcept(Person who, Concept question) throws APIException;
-        
-        /**