Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
05/09/08 10:53:35 (2 months ago)
Author:
bwolfe
Message:

Merging report-api-refactoring to trunk [2696]:[4157]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/trunk/src/api/org/openmrs/api/db/ObsDAO.java

    r4095 r4158  
    1818import java.util.Set; 
    1919 
     20import org.openmrs.Cohort; 
    2021import org.openmrs.Concept; 
    2122import org.openmrs.Encounter; 
    …… 
    2425import org.openmrs.Obs; 
    2526import org.openmrs.Person; 
    26 import org.openmrs.logic.Aggregation; 
    27 import org.openmrs.logic.Constraint; 
    28 import org.openmrs.reporting.PatientSet; 
    2927 
    3028/** 
    …… 
    133131 
    134132        /** 
    135          * @see org.openmrs.api.ObsService#getObservations(org.openmrs.Person,org.openmrs.logic.Aggregation) 
    136          */ 
    137         public List<Obs> getObservations(Person who, Aggregation aggregation, 
    138                         Concept question, Constraint constraint); 
    139  
    140         /** 
    141133         * @see org.openmrs.api.ObsService#getObservations(java.util.List<org.openmrs.Concept>, java.util.Date, java.util.Data, boolean) 
    142134         */ 
    …… 
    144136 
    145137        /** 
    146          * @see org.openmrs.api.ObsService#getObservations(PatientSet patients, List<Concept> concepts, Date fromDate, Date toDate) 
     138         * @see org.openmrs.api.ObsService#getObservations(Cohort patients, List<Concept> concepts, Date fromDate, Date toDate) 
    147139         */ 
    148         public List<Obs> getObservations(PatientSet patients, List<Concept> concepts, Date fromDate, Date toDate); 
     140        public List<Obs> getObservations(Cohort patients, List<Concept> concepts, Date fromDate, Date toDate); 
    149141}