Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/16/08 12:29:31 (6 months ago)
Author:
bwolfe
Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/1.3.x/src/web/org/openmrs/web/dwr/DrugOrderListItem.java

    r4095 r4947  
    2828        private Integer orderTypeId; 
    2929        private Integer conceptId; 
     30        private String conceptName; 
    3031        private String instructions; 
    3132        private String startDate; 
    …… 
    5960                orderId = drugOrder.getOrderId(); 
    6061                if ( drugOrder.getOrderType() != null ) orderTypeId = drugOrder.getOrderType().getOrderTypeId(); 
    61                 if ( drugOrder.getConcept() != null ) conceptId = drugOrder.getConcept().getConceptId(); 
     62                if ( drugOrder.getConcept() != null ) { 
     63                        conceptId = drugOrder.getConcept().getConceptId(); 
     64                        conceptName = drugOrder.getConcept().getName().getName(); 
     65                } 
    6266                instructions = drugOrder.getInstructions(); 
    6367 
    …… 
    506510        public int hashCode() { 
    507511                return this.orderId; 
    508         }        
     512        } 
     513 
     514        public String getConceptName() { 
     515        return conceptName; 
     516    } 
     517 
     518        public void setConceptName(String conceptName) { 
     519        this.conceptName = conceptName; 
     520    }    
    509521}