small fixes in progress note

lib/models/SOAP/GetAssessmentReqModel.dart

@@ -5,7 +5,8 @@ class GetAssessmentReqModel {
   String from;
   String to;
   int clinicID;
-  int doctorID;
+  dynamic doctorID;
+  dynamic editedBy;
 
   GetAssessmentReqModel(
       {this.patientMRN,
@@ -14,6 +15,7 @@ class GetAssessmentReqModel {
         this.from,
         this.to,
         this.clinicID,
+        this.editedBy,
         this.doctorID});
 
   GetAssessmentReqModel.fromJson(Map<String, dynamic> json) {
@@ -24,6 +26,7 @@ class GetAssessmentReqModel {
     to = json['To'];
     clinicID = json['ClinicID'];
     doctorID = json['DoctorID'];
+    editedBy = json['EditedBy'];
   }
 
   Map<String, dynamic> toJson() {
@@ -35,6 +38,7 @@ class GetAssessmentReqModel {
     data['To'] = this.to;
     data['ClinicID'] = this.clinicID;
     data['DoctorID'] = this.doctorID;
+    data['EditedBy'] = this.editedBy;
     return data;
   }
 }

lib/models/SOAP/GetGetProgressNoteReqModel.dart

@@ -5,7 +5,8 @@ class GetGetProgressNoteReqModel {
   String from;
   String to;
   int clinicID;
-  int doctorID;
+  dynamic doctorID;
+  dynamic editedBy;
 
   GetGetProgressNoteReqModel(
       {this.patientMRN,
@@ -14,6 +15,7 @@ class GetGetProgressNoteReqModel {
         this.from,
         this.to,
         this.clinicID,
+        this.editedBy,
         this.doctorID});
 
   GetGetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
@@ -24,6 +26,8 @@ class GetGetProgressNoteReqModel {
     to = json['To'];
     clinicID = json['ClinicID'];
     doctorID = json['DoctorID'];
+    editedBy = json['EditedBy'];
+
   }
 
   Map<String, dynamic> toJson() {
@@ -35,6 +39,7 @@ class GetGetProgressNoteReqModel {
     data['To'] = this.to;
     data['ClinicID'] = this.clinicID;
     data['DoctorID'] = this.doctorID;
+    data['EditedBy'] = this.editedBy;
     return data;
   }
 }

lib/models/SOAP/post_chief_complaint_request_model.dart

@@ -9,6 +9,8 @@ class PostChiefComplaintRequestModel {
   bool isLactation;
   int numberOfWeeks;
   dynamic doctorID;
+  dynamic editedBy;
+
 
   PostChiefComplaintRequestModel(
       {this.appointmentNo,
@@ -20,6 +22,7 @@ class PostChiefComplaintRequestModel {
       this.ispregnant,
       this.isLactation,
       this.doctorID,
+      this.editedBy,
       this.numberOfWeeks});
 
   PostChiefComplaintRequestModel.fromJson(Map<String, dynamic> json) {
@@ -33,6 +36,7 @@ class PostChiefComplaintRequestModel {
     isLactation = json['isLactation'];
     numberOfWeeks = json['numberOfWeeks'];
     doctorID = json['DoctorID'];
+    editedBy = json['EditedBy'];
   }
 
   Map<String, dynamic> toJson() {
@@ -47,6 +51,7 @@ class PostChiefComplaintRequestModel {
     data['isLactation'] = this.isLactation;
     data['numberOfWeeks'] = this.numberOfWeeks;
     data['DoctorID'] = this.doctorID;
+    data['EditedBy'] = this.editedBy;
 
     return data;
   }

lib/models/SOAP/post_physical_exam_request_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+  import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 
 class PostPhysicalExamRequestModel {
   List<ListHisProgNotePhysicalExaminationVM> listHisProgNotePhysicalExaminationVM;

lib/models/SOAP/post_progress_note_request_model.dart

@@ -3,15 +3,24 @@ class PostProgressNoteRequestModel {
   int episodeId;
   int patientMRN;
   String planNote;
+  dynamic doctorID;
+  dynamic editedBy;
 
   PostProgressNoteRequestModel(
-      {this.appointmentNo, this.episodeId, this.patientMRN, this.planNote});
+      {this.appointmentNo,
+      this.episodeId,
+      this.patientMRN,
+      this.planNote,
+      this.doctorID,
+      this.editedBy});
 
   PostProgressNoteRequestModel.fromJson(Map<String, dynamic> json) {
     appointmentNo = json['AppointmentNo'];
     episodeId = json['EpisodeID'];
     patientMRN = json['PatientMRN'];
     planNote = json['PlanNote'];
+    doctorID = json['DoctorID'];
+    editedBy = json['EditedBy'];
   }
 
   Map<String, dynamic> toJson() {
@@ -20,6 +29,8 @@ class PostProgressNoteRequestModel {
     data['EpisodeID'] = this.episodeId;
     data['PatientMRN'] = this.patientMRN;
     data['PlanNote'] = this.planNote;
+    data['DoctorID'] = this.doctorID;
+    data['EditedBy'] = this.editedBy;
     return data;
   }
 }

lib/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart

@@ -554,9 +554,11 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
               isLactation: false,
               ispregnant: false,
               doctorID: '',
+
               numberOfWeeks: 0);
       if (model.patientChiefComplaintList.isEmpty) {
         // TODO: make it postChiefComplaint after it start to work
+        postChiefComplaintRequestModel.editedBy='';
         await model.postChiefComplaint(postChiefComplaintRequestModel);
       } else {
         await model.patchChiefComplaint(postChiefComplaintRequestModel);

lib/widgets/patients/profile/soap_update/update_assessment_page.dart

@@ -49,6 +49,8 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
           GetAssessmentReqModel getAssessmentReqModel = GetAssessmentReqModel(
               patientMRN: widget.patientInfo.patientMRN,
               episodeID: widget.patientInfo.episodeNo.toString(),
+              editedBy: '',
+              doctorID: '',
               appointmentNo: widget.patientInfo.appointmentNo);
           await model.getPatientAssessment(getAssessmentReqModel);
           if(model.patientAssessmentList.isNotEmpty){

lib/widgets/patients/profile/soap_update/update_plan_page.dart

@@ -59,7 +59,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
             GetGetProgressNoteReqModel(
                 appointmentNo: widget.patientInfo.appointmentNo,
                 patientMRN: widget.patientInfo.patientMRN,
-                episodeID: widget.patientInfo.episodeNo.toString());
+                episodeID: widget.patientInfo.episodeNo.toString(), editedBy: '', doctorID: '');
         await model.getPatientProgressNote(getGetProgressNoteReqModel);
 
         if (model.patientProgressNoteList.isNotEmpty) {
@@ -285,15 +285,15 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
           patientMRN: widget.patientInfo.patientMRN,
           episodeId: widget.patientInfo.episodeNo,
           appointmentNo: widget.patientInfo.appointmentNo,
-          planNote: progressNoteController.text);
+          planNote: progressNoteController.text, doctorID: '', editedBy: '');
 
-      if(model.patientProgressNoteList.isEmpty){
+      // if(model.patientProgressNoteList.isEmpty){
         await model.postProgressNote(postProgressNoteRequestModel);
 
-      }else {
-        await model.patchProgressNote(postProgressNoteRequestModel);
-
-      }
+      // }else {
+      //   await model.patchProgressNote(postProgressNoteRequestModel);
+      //
+      // }
 
       if (model.state == ViewState.ErrorLocal) {
         helpers.showErrorToast(model.error);