OpenMRS

Timestamp:

07/10/08 13:50:09 (6 months ago)

Author:

rfoecking

Message:

complex-obs branch: Fixed bug - obs.isComplex() never returned true

Files:

• openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (17 diffs)

openmrs/branches/complex-obs/src/api/org/openmrs/api/impl/ObsServiceImpl.java

@@ -44 +44 @@
-/**
- * Default implementation of the Observation Service
- 
+
- * @see org.openmrs.api.ObsService
- */
@@ -56 +56 @@
-        /**
-         * Report handlers that have been registered.
- 
+
-         * This is filled via {@link #setHandlers(Map)} and spring's
-         * applicationContext-service.xml object
@@ -80 +80 @@
-        public Obs saveObs(Obs obs, String changeMessage) throws APIException {
-                // save or update complex obs
-
+getConcept().
-                        ComplexObsHandler handler = getHandler(obs);
-                        if (null != handler) {
@@ -163 +163 @@
-        /**
-         * Voids an Obs
- 
+
-         * If the Obs argument is an obsGroup, all group members will be voided.
- 
+
-         * @see org.openmrs.api.ObsService#voidObs(org.openmrs.Obs,
-         *      java.lang.String)
@@ -208 +208 @@
-         * Convenience method that recursively finds all
-         * child/grandchild/greatgrandchild group members of the given parentObs
- 
+
-         * @param parentObs
-         * @param childMembers
@@ -225 +225 @@
-        /**
-         * Unvoids an Obs
- 
+
-         * If the Obs argument is an obsGroup, all group members with the same
-         * dateVoided will also be unvoided.
- 
+
-         * @see org.openmrs.api.ObsService#unvoidObs(org.openmrs.Obs)
-         * @param Obs obs the Obs to unvoid
@@ -388 +388 @@
-         * <code>searchString</code> with the patient's identifier, encounterId,
-         * and obsId
- 
+
-         * @see org.openmrs.api.ObsService#getObservations(java.lang.String)
-         */
@@ -441 +441 @@
-        /**
-         * Correct use case:
- 
+
-         * <pre>
-         * Obs parent = new Obs();
-         * Obs child1 = new Obs();
-         * Obs child2 = new Obs();
- 
+
-         * parent.addGroupMember(child1);
-         * parent.addGroupMember(child2);
-         * </pre>
- 
+
-         * @deprecated This method should no longer need to be called on the api.
-         *             This was meant as temporary until we created a true ObsGroup
-         *             pojo.
- 
+
-         * @see org.openmrs.api.ObsService#createObsGroup(org.openmrs.Obs[])
-         */
@@ -565 +565 @@
-         * Convenience method for turning a string like "location.locationId asc,
-         * obs.valueDatetime desc" into a list of strings to sort on
- 
+
-         * @param sort string
-         * @return simple list of strings to sort on without asc/desc
@@ -592 +592 @@
-         * This method should be removed when all methods using an Integer
-         * personType are removed.
- 
+
-         * This method does a bitwise compare on <code>personType</code> and
-         * returns a list of PERSON_TYPEs that are comparable
- 
+
-         * @param personType Integer corresponding to {@link ObsService#PERSON},
-         *        {@link ObsService#USER}, or {@link ObsService#PATIENT},
@@ -630 +630 @@
-                return obsSet;
-        }
-
+
-        public List<Obs> getObservationsByPersonAndConcept(Person who, Concept question) throws APIException {
-                List<Person> whom = new Vector<Person>();
@@ -637 +637 @@
-                List<Concept> questions = new Vector<Concept>();
-                questions.add(question);
-
+
-                return getObservations(whom, null, questions, null, null, null, null, null, null, null, null, false);
-        }
@@ -862 +862 @@
-                Date fromDate, Date toDate) {
-                List<Person> persons = new Vector<Person>();
-
+
-                if (patients != null)
-                        for (Integer memberId : patients.getMemberIds())
-                                persons.add(new Person(memberId));
-
+
-                return getObservations(persons, null, concepts, null, null, null, null, null, null, fromDate, toDate, false);
-        }
@@ -881 +881 @@
-                return obs;
-        }
-
+
-        /**
-         * @see org.openmrs.api.ObsService#getAllComplexObs()
@@ -920 +920 @@
-        /**
-         * Voids an Obs
- 
+
-         * If the Obs argument is an obsGroup, all group members will be voided.
- 
+
-         * @see org.openmrs.api.ObsService#voidObs(org.openmrs.Obs,
-         *      java.lang.String)
@@ -935 +935 @@
-         * Obs.isComplexObs() is false or there is an error instantiating the
-         * handler class.
- 
+
-         * @param obs A complex Obs.
-         * @return ComplexObsHandler for the complex Obs. or null on error.
@@ -974 +974 @@
-        /**
-         * ADDs handlers...doesn't replace them.
- 
+
-         * @see org.openmrs.api.ObsService#setHandlers(Map)
-         */