add appointment dateAppointmentScheduled property

Bahmni · May 29, 2024 · c907cf6 · c907cf6
1 parent c952494
commit c907cf6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/appointments/model/Appointment.java b/api/src/main/java/org/openmrs/module/appointments/model/Appointment.java
@@ -23,6 +23,7 @@ public class Appointment extends BaseOpenmrsData implements Serializable {
     private Integer appointmentId;
     private String appointmentNumber;
     private Date dateCreated;
+    private Date dateAppointmentScheduled = new Date();
     private Patient patient;
     private AppointmentServiceDefinition service;
     private AppointmentServiceType serviceType;
@@ -250,6 +251,14 @@ public Date getDateCreated() {
         return dateCreated;
     }
 
+    public Date getDateAppointmentScheduled() {
+        return dateAppointmentScheduled;
+    }
+
+    public void setDateAppointmentScheduled(Date dateAppointmentScheduled) {
+        this.dateAppointmentScheduled = dateAppointmentScheduled;
+    }
+
     @Override
     public void setDateCreated(Date dateCreated) {
         this.dateCreated = dateCreated;

diff --git a/api/src/main/resources/Appointment.hbm.xml b/api/src/main/resources/Appointment.hbm.xml
@@ -45,6 +45,7 @@
         <property name="comments" type="java.lang.String" column="comments"/>
 
         <property name="dateCreated" type="java.util.Date" column="date_created"/>
+        <property name="dateAppointmentScheduled" type="java.util.Date" column="date_appointment_scheduled"/>
         <property name="dateChanged" type="java.util.Date" column="date_changed"/>
         <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
         <property name="voided" type="java.lang.Boolean" column="voided" length="1" not-null="true" />

diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -731,4 +731,15 @@
         <addForeignKeyConstraint constraintName="patient_appointment_fulfilling_encounter_map_patient_appointment" baseTableName="patient_appointment_fulfilling_encounter_map" baseColumnNames="patient_appointment_id" referencedTableName="patient_appointment" referencedColumnNames="patient_appointment_id"/>
         <addForeignKeyConstraint constraintName="patient_appointment_fulfilling_encounter_map_encounter" baseTableName="patient_appointment_fulfilling_encounter_map" baseColumnNames="fulfilling_encounter_id" referencedTableName="encounter" referencedColumnNames="encounter_id"/>
     </changeSet>
+    <changeSet id="add_date_appointment_scheduled_20240528" author="aojwang">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists columnName="date_appointment_scheduled" tableName="patient_appointment"/>
+            </not>
+        </preConditions>
+        <sql>
+            ALTER TABLE patient_appointment
+                ADD COLUMN date_appointment_scheduled DATE NULL;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
diff --git a/...rc/main/java/org/openmrs/module/appointments/web/contract/AppointmentDefaultResponse.java b/...rc/main/java/org/openmrs/module/appointments/web/contract/AppointmentDefaultResponse.java
@@ -9,6 +9,7 @@ public class AppointmentDefaultResponse {
 	private String uuid;
 	private String appointmentNumber;
 	private Date dateCreated;
+	private Date dateAppointmentScheduled;
 	private Map patient;
 	private AppointmentServiceDefaultResponse service;
 	private Map serviceType;
@@ -194,4 +195,12 @@ public Date getDateCreated() {
 	public void setDateCreated(Date dateCreated) {
 		this.dateCreated = dateCreated;
 	}
+
+	public Date getDateAppointmentScheduled() {
+		return dateAppointmentScheduled;
+	}
+
+	public void setDateAppointmentScheduled(Date dateAppointmentScheduled) {
+		this.dateAppointmentScheduled = dateAppointmentScheduled;
+	}
 }
diff --git a/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java b/omod/src/main/java/org/openmrs/module/appointments/web/mapper/AppointmentMapper.java
@@ -199,6 +199,7 @@ private AppointmentDefaultResponse mapToDefaultResponse(Appointment a, Appointme
         response.setUuid(a.getUuid());
         response.setAppointmentNumber(a.getAppointmentNumber());
         response.setDateCreated(a.getDateCreated());
+        response.setDateAppointmentScheduled(a.getDateAppointmentScheduled());
         response.setPatient(createPatientMap(a.getPatient()));
         response.setService(appointmentServiceMapper.constructDefaultResponse(a.getService()));
         response.setServiceType(createServiceTypeMap(a.getServiceType()));