Branch update patient fields #102

AaronJT1 · 2023-10-16T06:33:02Z

Summary of change

Fixed the Patient class constructor and updated some of its dependency to use the new fields. More details on dependency given below.

Key changes

Update `Patient.java` constructor

1.Update the constructor parameter to take in correct arguments.

Update `Record.java` constructor

1.Update Record object to initialise with default values for its fields.

Update `PatientBuilder.java`

1.Update PatientBuilder class to use new Patient fields

Update Patient attribute fields

1.Update Patient attribute fields to have a default values

Update `AddCommandParser.java` class

1.Update AddCommandParser.java to use new Patient attributes

Update `SampleDataUtil.java`

1.Update the Patient sample data in SampleDataUtil.java to use the new Patient attributes

Update JsonAdaptedPatient files

1.Update JsonAdaptedPatient.java to use the new Patient fields.
2.Update JsonAdaptedPatientTest.java to use the new Patient fields.

Currently, Patient class is taking in Department and Record as input Department and Record are to be created when Patient is created, thus it shouldnt be an input Update Patient constructor to remove AssignedDepartment and Record parameters, also initialiazed them with default values

Currently, the instantiation of Record class does not initialise default values for other fields. This means that if a particular program wants to get its attribute value, it could lead to null value. Update Record.java to include 3 default initialization values for its fields

Currently, the sample patients are using outdated fields. It is important to update the patients to use the new fields. Add the Gender, IcNumber and Birthday fields to sample Patients

wujy28

Looks good in general! However, I have made some suggestions and highlighted some potential issues that would be good to look into :)

wujy28 · 2023-10-16T11:00:05Z

src/main/java/seedu/address/model/patient/Patient.java

@@ -44,8 +44,8 @@ public Patient(Name name, Phone phone, Email email, Gender gender, IcNumber icNu
        this.birthday = birthday;
        this.address = address;
        this.tags.addAll(tags);
-        this.assignedDepartment = assignedDepartment;
-        this.record = record;
+        this.assignedDepartment = new AssignedDepartment(); // default Department given


Nice! Just to note that we might be changing this such that the Patient is immediately assigned to the Emergency Department upon creation so that it is reflected in the database straight away and the doctor won't have to manually assign a newly admitted patient to the emergency department. The default department is displayed as "-" as a string and is meant to be used for inactive patients, but for now we can just assign it to newly instantiated patient objects.

Hi, have taken note of this, thanks!

wujy28 · 2023-10-16T11:02:18Z

src/main/java/seedu/address/model/patient/Record.java

-                .add("treatmentPlan", treatmentPlan)
-                .toString();
+        return new ToStringBuilder(this).add("patient", patient).add("initialObservations", initialObservations)
+            .add("diagnosis", diagnosis).add("treatmentPlan", treatmentPlan).toString();


Not sure about the indentation here but I feel like the one before looks a bit neater? 😅

Would fix the indentation one shot after further changes, thanks for pointing out!

wujy28 · 2023-10-16T11:09:01Z

src/main/java/seedu/address/logic/parser/AddCommandParser.java

-import seedu.address.model.patient.Name;
-import seedu.address.model.patient.Patient;
-import seedu.address.model.patient.Phone;
+import seedu.address.model.patient.*;


Also I believe that the coding standard guide says that we should list the imports explicitly instead of using wildcard imports? If not then it's ok

Got it, java have the tendency to change all related imports to a single *, will update it!!

wujy28 · 2023-10-16T11:22:09Z

src/main/java/seedu/address/storage/JsonAdaptedPatient.java

                              @JsonProperty("tags") List<JsonAdaptedTag> tags) {
        this.name = name;
        this.phone = phone;
        this.email = email;
+        this.gender = gender;


Hmm it appears that the patient's department is not stored here. I feel like it might be needed though, in the case where for whatever reason the user has to relaunch the app (e.g. in the middle of a shift) and finds that all the data about the patient's department is gone (then they wouldn't know where each patient is now).

I was thinking we can overload the constructor and have two constructors. One can be for the reading of addressbook from file (need to store department info) and we can have the constructor take in a department string as an argument. The other is for creating new patient objects (like for the add command), then we don't need the department param.

Also we need to eventually find a way to store the records into the hard disk as well 😔

You are right, i think i will create a github task for the next iteration. Definitely will have to focus on storage next iteration!!

wujy28 · 2023-10-16T11:26:11Z

src/main/java/seedu/address/model/patient/Age.java

@@ -11,6 +11,7 @@ public class Age {
    public static final String MESSAGE_CONSTRAINTS =
            "Age should only contain numbers, and it should not be negative";
    public static final String VALIDATION_REGEX = "\\d+";
+    public static String DEFAULT_AGE = "30";


Hmm, perhaps it will be better for the dummy default values to be more obvious (like '00') or something? So that the user will less likely mix up the entries with non-default values and those with default values (in case they want to come back and fill in the details again). This applies to default birthday and other attributes as well

Thanks for pointing that out. Have updated the values to look more default!

wujy28 · 2023-10-16T11:27:34Z

src/main/java/seedu/address/logic/parser/AddCommandParser.java

+    public static Patient createPatientFromPresentPrefixes(Name name, Phone phone, Email email, Gender gender,
+                                                           IcNumber icNumber, Birthday birthday, Address address,
+                                                           Set<Tag> tags, ArgumentMultimap argMultimap,
+                                                           Prefix[] prefixes) throws ParseException {
        for (Prefix p : prefixes) {


Also I'm not sure whether I am tripping or missing something but I don't see the cases for the other prefixes here? 🤣 Or will they only be added later?

Yup they will be added later!! Would require the ParserUtil class to be completed before i can continue the implementation.

Yup everything looks good! Definitely agree with the changes Jingya suggested! Points of focus for the next iteration:

Including the remaining prefixes to be parsed to create patient objects

Finding a way to load and save tasks for storage of patient info.

Updating the Emergency Department where - is used for inactive patients rather than new patients!

Got it thanks!

wujy28

Thanks for making these changes! The default values are a lot clearer now :)

AaronJT1 added 8 commits October 16, 2023 12:01

Update PatientBuilder.java to cater to new Patient class

a47d6c3

Update each Patient attribute to have default value

8a6510d

Update AddCommandParser.java to use new Patient class

9df51a2

Update SampleDataUtil.java to use new Patient class

b6e2c2e

Currently, the sample patients are using outdated fields. It is important to update the patients to use the new fields. Add the Gender, IcNumber and Birthday fields to sample Patients

Update JsonAdaptedPatient.java to use new Patient class

d63a1c3

Update JsonAdaptedPatientTest.java to include new Patient attributes

3dd88ff

AaronJT1 added the priority.High Must do label Oct 16, 2023

AaronJT1 added this to the v1.2b milestone Oct 16, 2023

AaronJT1 requested review from RiyaMehta2211 and wujy28 October 16, 2023 06:33

AaronJT1 self-assigned this Oct 16, 2023

wujy28 requested changes Oct 16, 2023

View reviewed changes

Update patient attributes to have more intuitive default values

17c2e69

wujy28 approved these changes Oct 16, 2023

View reviewed changes

wujy28 merged commit 294222e into AY2324S1-CS2103T-T14-2:master Oct 17, 2023
0 of 3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Branch update patient fields #102

Branch update patient fields #102

AaronJT1 commented Oct 16, 2023

wujy28 left a comment

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

wujy28 Oct 16, 2023

wujy28 Oct 16, 2023

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

wujy28 Oct 16, 2023

AaronJT1 Oct 16, 2023

RiyaMehta2211 Oct 16, 2023

AaronJT1 Oct 17, 2023

wujy28 left a comment

Branch update patient fields #102

Branch update patient fields #102

Conversation

AaronJT1 commented Oct 16, 2023

Summary of change

Fixed the Patient class constructor and updated some of its dependency to use the new fields. More details on dependency given below.

Key changes

Update Patient.java constructor

Update Record.java constructor

Update PatientBuilder.java

Update Patient attribute fields

Update AddCommandParser.java class

Update SampleDataUtil.java

Update JsonAdaptedPatient files

wujy28 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wujy28 left a comment

Choose a reason for hiding this comment

Update `Patient.java` constructor

Update `Record.java` constructor

Update `PatientBuilder.java`

Update `AddCommandParser.java` class

Update `SampleDataUtil.java`