From c9512f66eaa31bcfb3aed6d3dea8cfd284dcee8b Mon Sep 17 00:00:00 2001 From: Avanti Patil Date: Sun, 27 Feb 2022 16:18:40 +0530 Subject: [PATCH 1/3] -get lab orders fixed in clinical module -print medication add into clinical medication -OPD-Examination add for Examination change -Hide Medication from order module -changes for medication print page --- .../DanpheEMR.DalLayer/BillingDbContext.cs | 3 + .../Controllers/Billing/BillingController.cs | 3 +- .../OPD-Examination.component.html | 128 +++++++++++++ .../OPD-Examination.component.ts | 178 ++++++++++++++++++ .../src/app/clinical-notes/notes.module.ts | 4 +- .../shared/OPD-Examination.model.ts | 9 + .../home-medication-list.component.ts | 8 +- .../dashboard/doctor-dashboard.component.ts | 18 +- .../doctors/dashboard/doctor-dashboard.html | 5 + .../order/order-requisition.component.ts | 1 + .../src/app/orders/order/print-order.ts | 52 ++++- .../grid-column-settings.constant.ts | 3 +- .../clinical-view/HomeMedicationList.html | 5 + .../src/app/view/order-view/OrderMain.html | 16 +- .../app/view/order-view/PrintMedications.html | 46 ++--- 15 files changed, 440 insertions(+), 39 deletions(-) create mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html create mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts create mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts diff --git a/Code/Components/DanpheEMR.DalLayer/BillingDbContext.cs b/Code/Components/DanpheEMR.DalLayer/BillingDbContext.cs index bccc9c7a..349a55d6 100644 --- a/Code/Components/DanpheEMR.DalLayer/BillingDbContext.cs +++ b/Code/Components/DanpheEMR.DalLayer/BillingDbContext.cs @@ -92,6 +92,8 @@ public BillingDbContext(string conn) : base(conn) this.AuditDisabled = true; } + public DbSet IntegrationName { get; set; } + protected override void OnModelCreating(DbModelBuilder modelBuilder) { @@ -171,6 +173,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder) modelBuilder.Entity().ToTable("CFG_PrinterSettings"); modelBuilder.Entity().ToTable("Lab_MST_LabVendors"); + modelBuilder.Entity().ToTable("ServiceDepartment_MST_IntegrationName"); } //Sud: 14sept'18 -- diff --git a/Code/Websites/DanpheEMR/Controllers/Billing/BillingController.cs b/Code/Websites/DanpheEMR/Controllers/Billing/BillingController.cs index ae321b4d..2fdc646d 100644 --- a/Code/Websites/DanpheEMR/Controllers/Billing/BillingController.cs +++ b/Code/Websites/DanpheEMR/Controllers/Billing/BillingController.cs @@ -3661,7 +3661,8 @@ public string Post() srvDepartment = (from billItem in billingDbContext.BillItemPrice join srvDept in billingDbContext.ServiceDepartment on billItem.ServiceDepartmentId equals srvDept.ServiceDepartmentId join dept in billingDbContext.Departments on srvDept.DepartmentId equals dept.DepartmentId - where (dept.DepartmentName.ToLower() == req.DepartmentName.ToLower() + join sd in billingDbContext.IntegrationName on srvDept.IntegrationName.ToLower() equals sd.IntegrationName.ToLower() + where (sd.IntegrationName.ToLower() == req.DepartmentName.ToLower() && billItem.ItemName.ToLower() == req.ItemName.ToLower()) select srvDept).FirstOrDefault(); } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html new file mode 100644 index 00000000..33f4d0d8 --- /dev/null +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html @@ -0,0 +1,128 @@ + +
+ + + + + + + +
+
+ + + + +
+
+
+
+

Instructions

+
+
+
+ +
+
+
+ +
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+ +
+ \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts new file mode 100644 index 00000000..ef8e61d8 --- /dev/null +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts @@ -0,0 +1,178 @@ +import { Component, Output, EventEmitter, Input } from "@angular/core"; +import * as moment from 'moment/moment'; +import { Patient } from "../../patients/shared/patient.model"; +import { Visit } from "../../appointments/shared/visit.model"; +import { NotesModel } from "../shared/notes.model"; +import { PatientClinicalDetail } from "../../clinical/shared/patient-clinical-details.vmodel"; +import { AssessmentAndPlanModel, DiagnosisOrderVM } from "../shared/assessment-and-plan.model"; +import { VisitService } from "../../appointments/shared/visit.service"; +import { MessageboxService } from "../../shared/messagebox/messagebox.service"; +import { CoreService } from "../../core/shared/core.service"; +import { NoteTemplateBLService } from "../shared/note-template.bl.service"; +import { PatientService } from "../../patients/shared/patient.service"; +import { PatientOrderListModel } from "../../clinical/shared/order-list.model"; +import { OPDExaminationModel } from "../shared/OPD-Examination.model"; + +@Component({ + selector: "OPD-Examination", + templateUrl: "./OPD-Examination.component.html", +}) + +export class OPDExaminationComponent{ + public pat: Patient = new Patient(); + public patVisit: Visit = new Visit(); + public date: string = null; + public selectedDepartment: any = null; + public notes: NotesModel = new NotesModel(); + public FollowUp = { + Number: 0, + Unit: 'Days', + } + public clinicalDetail: PatientClinicalDetail = new PatientClinicalDetail(); + + @Output() + public outPutHpNote: EventEmitter = new EventEmitter(); + public assessment: AssessmentAndPlanModel = new AssessmentAndPlanModel(); + public showAP: boolean = false; + public APeditMode: boolean = false; + public assessmentForEdit: any; + public showSOnotes: boolean = false; + public showExamination : boolean = true; + constructor(public visitService: VisitService, + public msgBoxServ: MessageboxService, + public coreService: CoreService, + public notetemplateBLService: NoteTemplateBLService, + public patientService: PatientService) { + this.pat = this.patientService.globalPatient; + this.patVisit = this.visitService.globalVisit, + this.date = moment().format("YYYY-MM-DD,h:mm:ss a"); + + } + @Input('OPD-Examination') + public opdExamination: OPDExaminationModel = new OPDExaminationModel(); + @Output("Examination") + Examination: EventEmitter = new EventEmitter(); + @Input('editHpNote') + public set HpNote(hpNote: any) { + if (this.notetemplateBLService.NotesId != 0) { + //this.editMode = true; + this.notes = hpNote; + console.log("notes in hp component, edit input:"); + console.log(this.notes); + + // get assessment orders + this.GetAllOrders(this.notes.NotesId); + this.APeditMode = true; + this.showSOnotes = true; + + } else { + this.showSOnotes = true; + this.showAP = true; + } + } + + public GetAllOrders(NoteId) { + this.notetemplateBLService.GetAllOrdersByNoteId(NoteId) + .subscribe(res => { + if (res.Status = "OK") { + + var diagnosis: any = res.Results; + + console.log("diagnosis Temp:"); + console.log(diagnosis); + + var DiagnosisOrdersList: Array = []; + + diagnosis[0].DiagnosisOrdersList.forEach(item => { + + + var OrdersList: Array = []; + + + item.AllIcdLabOrders.forEach(lab => { + var Order: PatientOrderListModel = new PatientOrderListModel(); + Order.Order = lab; OrdersList.push(Order); + }); + item.AllIcdImagingOrders.forEach(img => { + var Order: PatientOrderListModel = new PatientOrderListModel(); + Order.Order = img; OrdersList.push(Order); + }); + + item.AllIcdPrescriptionOrders.forEach(med => { + var Order: PatientOrderListModel = new PatientOrderListModel(); + Order.Order = med; + Order.Dosage = med.Dosage; + Order.Frequency = med.Frequency; + Order.Duration = med.HowManyDays; + OrdersList.push(Order); + }); + + + var DiagnosisOrders: DiagnosisOrderVM = new DiagnosisOrderVM(); + + DiagnosisOrders.DiagnosisId = item.DiagnosisId; + DiagnosisOrders.ICD = item.ICD[0]; + DiagnosisOrders.IsEditable = item.IsEditable; + DiagnosisOrders.OrdersList = OrdersList; + + DiagnosisOrdersList.push(DiagnosisOrders); + + }); + + console.log("Generated DiagnosisOrdersList:"); + console.log(DiagnosisOrdersList); + + this.assessment.DiagnosisOrdersList = DiagnosisOrdersList; + this.assessment.NotesId = diagnosis[0].NotesId; + this.assessment.PatientId = diagnosis[0].PatientId; + this.assessment.PatientVisitId = diagnosis[0].PatientVisitId; + + console.log("new diagnosis:"); + console.log(this.assessment); + + //var length = Object.keys(this.diagnosis).length + //console.log(length); + + //var test: any; + //test = Object.keys(this.diagnosis1).map(key => this.diagnosis1[key]); + //console.log("test:"); + //console.log(test); + + //this.assessmentForEdit = { editMode: false, assessment: this.assessment } + this.showAP = true; + } + }); + } + + FocusOut() { + //console.log(this.notes.EmergencyNote); + this.outPutHpNote.emit(this.notes); + } + + CallBackSubjective($event) { + this.notes.SubjectiveNote = $event.subjectivenote; + //console.log(this.notes.EmergencyNote.SubjectiveNote); + this.outPutHpNote.emit(this.notes); + } + + CallBackObjective($event) { + this.notes.ObjectiveNote = $event.objectivenote; + //console.log(this.notes.EmergencyNote.ObjectiveNote); + this.outPutHpNote.emit(this.notes); + } + + CallBackAssesmentAndPlan(data) { + console.log("from assessment orders:"); + console.log(data); + this.notes.ClinicalDiagnosis = data; + this.outPutHpNote.emit(this.notes); + } + Close() { + this.showExamination=false; + this.Examination.emit({ action: "balance-History"}); + // this.patientInfo = null; + } +} + + + diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts index 768fb65e..534fc4bd 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts @@ -28,6 +28,7 @@ import { ViewHistoryAndPhysicalNoteComponent } from './templates/history-and-phy import { ViewEmergencyNoteComponent } from './templates/emergency-note/view-emergency-note.component'; import { ClinicalPrescriptionNoteComponent } from './prescription-note/clinical-prescription-note.component'; import { ViewClinicalPrescriptionNoteComponent } from './prescription-note/view-clinical-prescription-note.component'; +import { OPDExaminationComponent } from './OPDExamination/OPD-Examination.component'; @NgModule({ @@ -65,7 +66,8 @@ import { ViewClinicalPrescriptionNoteComponent } from './prescription-note/view- ViewHistoryAndPhysicalNoteComponent, ViewEmergencyNoteComponent, ClinicalPrescriptionNoteComponent, - ViewClinicalPrescriptionNoteComponent + ViewClinicalPrescriptionNoteComponent, + OPDExaminationComponent ] }) diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts new file mode 100644 index 00000000..5e32d0a7 --- /dev/null +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts @@ -0,0 +1,9 @@ +export class OPDExaminationModel { + public PatientId: number = 0; + public PatientVisitId: number = 0; + public CreatedBy: number = null; + public CreatedOn: string = null; + public ModifiedBy: number = null; + public ModifiedOn: string = null; + public IsActive: boolean = true; +} \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical/medications/home-medication-list.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical/medications/home-medication-list.component.ts index a52a3487..1b2c7d44 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical/medications/home-medication-list.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical/medications/home-medication-list.component.ts @@ -5,6 +5,8 @@ import { MessageboxService } from '../../shared/messagebox/messagebox.service'; import { HomeMedication } from "../shared/home-medication.model"; import { HttpClient} from '@angular/common/http'; import * as moment from 'moment/moment'; +import { Router } from "@angular/router"; +import { Patient } from "../../patients/shared/patient.model"; @Component({ templateUrl: "../../view/clinical-view/HomeMedicationList.html" // "/ClinicalView/HomeMedication" }) @@ -18,7 +20,7 @@ export class HomeMedicationListComponent { constructor(public patientService: PatientService, public medicationBLService: MedicationBLService, public changeDetector: ChangeDetectorRef, - public msgBoxServ: MessageboxService, public http: HttpClient) { + public msgBoxServ: MessageboxService, public http: HttpClient,public router: Router) { this.GetHomeMedicationList(); } //get the list of surgical history of the selected patient. @@ -62,4 +64,8 @@ export class HomeMedicationListComponent { this.homemedications.push($event.homeMedication); } } + public currPat: Patient = new Patient(); + printMedications() { + this.router.navigate(['/Doctors/PatientOverviewMain/Orders/PrintMedication']); + } } \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.component.ts index 2bd8c7f6..7dbb716f 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.component.ts @@ -26,6 +26,7 @@ import { GridEmitModel } from "../../shared/danphe-grid/grid-emit.model"; import { SecurityService } from '../../security/shared/security.service'; import { DanpheCache, MasterType } from '../../shared/danphe-cache-service-utility/cache-services'; import { Employee } from '../../employee/shared/employee.model'; +import { OPDExaminationModel } from '../../clinical-notes/shared/OPD-Examination.model'; @Component({ templateUrl: "./doctor-dashboard.html" // "/DoctorsView/DoctorDashboard" }) @@ -65,6 +66,8 @@ export class DoctorDashboardComponent implements OnDestroy { public patientVisitType: string = "all"; private appointmentList: any; public Timer: any = null; + public showExamination :boolean = false; + public opdExamination: OPDExaminationModel = new OPDExaminationModel(); constructor( _patientService: PatientService, _visitServ: VisitService, @@ -316,11 +319,24 @@ export class DoctorDashboardComponent implements OnDestroy { } break; + case "Examination": + { + this.Examination($event.Data); + //this.showExamination= true; + } + break; default: break; } } - + Examination(selectedVisit: Visit) { + this.SelectVisit(selectedVisit); + this.showExamination = true; + } + CallBackExamination($event){ + this.showExamination = false; + + } loadDocDeptVisitList() { for (var i in this.DateValidator.controls) { this.DateValidator.controls[i].markAsDirty(); diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.html index 1a3fe72b..d2326714 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/doctors/dashboard/doctor-dashboard.html @@ -157,3 +157,8 @@

Re-assign this patient

+ + + diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/order-requisition.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/order-requisition.component.ts index a5e1c056..8d68bc42 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/order-requisition.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/order-requisition.component.ts @@ -475,6 +475,7 @@ export class OrderRequisitionsComponent { currReq.DiagnosisId = null; currReq.VisitType = this.currPatVisitContext.VisitType; currReq.WardName = this.currPatVisitContext.Current_WardBed; + currReq.OrderDateTime = this.currTime retLabReqList.push(currReq); }); } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/print-order.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/print-order.ts index 5cf87276..e938e27b 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/print-order.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/orders/order/print-order.ts @@ -1,7 +1,12 @@ -import { Component } from '@angular/core'; +import { Component, Output } from '@angular/core'; import { Router } from '@angular/router'; import { PatientService } from '../../patients/shared/patient.service'; import { Patient } from '../../patients/shared/patient.model'; +import { MedicationBLService } from '../../clinical/shared/medication.bl.service'; +import { MessageboxService } from '../../shared/messagebox/messagebox.service'; +import { HomeMedication } from '../../clinical/shared/home-medication.model'; +import { EventEmitter } from 'events'; +import { CoreService } from '../../core/shared/core.service'; @Component({ templateUrl: "../../view/order-view/PrintMedications.html" // "/OrderView/PrintMedications" @@ -9,12 +14,36 @@ import { Patient } from '../../patients/shared/patient.model'; export class PrintMedicationsComponent { public currPat: Patient = new Patient(); - constructor(public router: Router, public patService: PatientService) { + public medicine: Array = new Array(); + public hospitalName :string = ''; + public address :string = ''; + public email :string = ''; + public tel :string = ''; + public pan :string = ''; + constructor(public patientService: PatientService, + public router: Router, public patService: PatientService, + public medicationBLService: MedicationBLService, + public msgBoxServ: MessageboxService, + public coreService : CoreService) { this.currPat = this.patService.getGlobal(); + this.GetCustomerHeaderParameter(); + this.GetMedication(); + } +GetMedication(){ + let patientId = this.patientService.getGlobal().PatientId; + this.medicationBLService.GetHomeMedicationList(patientId) + .subscribe(res => { + if (res.Status == "OK") { + this.medicine = res.Results; + } + else { + this.msgBoxServ.showMessage("failed", ['Failed to Load Home Medication List for this Patient.'], res.ErrorMessage); + } + }); +} - - print() { +print() { let popupWinindow; var printContents = document.getElementById("medicinePrintpage").innerHTML; popupWinindow = window.open('', '_blank', 'width=1600,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); @@ -23,5 +52,20 @@ export class PrintMedicationsComponent { popupWinindow.document.write('' + printContents + ''); popupWinindow.document.close(); } +Back(){ + this.router.navigate(['/Doctors/PatientOverviewMain/Clinical/HomeMedication']); +} +GetCustomerHeaderParameter() { + try { + let headerInfo = JSON.parse(this.coreService.Parameters.filter(a => a.ParameterName == 'CustomerHeader')[0]["ParameterValue"]); + this.hospitalName = headerInfo.hospitalName; + this.address = headerInfo.address; + this.email = headerInfo.email; + this.tel = headerInfo.tel; + this.pan = headerInfo.pan; + } catch (ex) { + + } +} } \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/shared/danphe-grid/grid-column-settings.constant.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/shared/danphe-grid/grid-column-settings.constant.ts index 65c80fdb..26992581 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/shared/danphe-grid/grid-column-settings.constant.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/shared/danphe-grid/grid-column-settings.constant.ts @@ -3021,7 +3021,8 @@ return template; - `, + + `, }, ]; //View Clinical-notes Template diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/clinical-view/HomeMedicationList.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/clinical-view/HomeMedicationList.html index 3ca0f9b4..09edff40 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/clinical-view/HomeMedicationList.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/clinical-view/HomeMedicationList.html @@ -61,6 +61,11 @@ [show-homemedication-add]="showMedicationAddBox" (callback-addupdate)="CallBackAddUpdate($event)"> +
+
+ Print Medication +
+
diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/OrderMain.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/OrderMain.html index 887ac40b..a9b548f4 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/OrderMain.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/OrderMain.html @@ -72,7 +72,7 @@ width: 100%; border: 1px solid #f3f3f3; margin-bottom: 15px; - border-radius: 5px !important;" + border-radius: 5px !important; } .cstm-pt-title { background: transparent; @@ -121,7 +121,7 @@ -
+
@@ -216,7 +216,7 @@ {{res.OrderStatus}} - + {{req.ImagingTypeName}} {{req.ImagingItemName}}   {{req.ImagingDate | DanpheDateTime:'datename':'DD.MM.YYYY HH:mm'}} @@ -262,7 +262,7 @@ - + @@ -332,11 +332,11 @@
-
+
diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/PrintMedications.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/PrintMedications.html index 8d7a15b0..cba633a7 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/PrintMedications.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/view/order-view/PrintMedications.html @@ -1,24 +1,26 @@ - +
-
- - - - - - -
PAN Number: 500066416PAN Number: 500066416PAN Number: 500066416
- -
-

Hospital For Advanced Medicine and Surgery

-

Mandikhatar, Kathmandu, Nepal

-

Ph No: 01-6224747/4377404

-
+
+
+

{{hospitalName}}

+

{{address}},

+

Ph No: {{tel}}

+

{{title}}

+
+ +
+

+ {{hospitalName}} +

+

{{address}}

+

Ph No:{{tel}}

+ +
@@ -45,14 +47,14 @@

+

- - - - + + + +
{{i+1}}{{medicine.MedicationName}}{{medicine.Dose}}{{medicine.Frequency}}{{medicine.Duration}}{{med.MedicationName}}{{med.Dose}}{{med.Frequency}}{{med.Route}}
@@ -78,4 +80,4 @@

Print

-
\ No newline at end of file +
From 56eb92ddeff2eaee94046aae1f1afbc2bc86f2b3 Mon Sep 17 00:00:00 2001 From: Avanti Patil Date: Thu, 3 Mar 2022 20:33:32 +0530 Subject: [PATCH 2/3] Clinical OPD Examination component added and done changes. --- .../ClinicalModels/VitalsModel.cs | 22 +- .../Clinical/ClinicalController.cs | 327 ++++++++++ .../OPD-Examination.component.html | 215 ++++++- .../OPD-Examination.component.ts | 605 +++++++++++++++++- .../opd-examination-view.component.ts | 86 +++ .../OPDExamination/opd-examination-view.html | 163 +++++ .../assessment-plan/assessment-plan.html | 3 +- .../clinical-notes/notes-main.component.ts | 12 +- .../clinical-notes/notes-routing.constant.ts | 4 +- .../src/app/clinical-notes/notes.module.ts | 8 +- .../objective/objective-note.component.ts | 19 +- .../objective/objective-note.html | 120 +++- .../shared/OPD-Examination.model.ts | 9 - .../shared/note-template.bl.service.ts | 11 + .../subjective/subjective-note.component.ts | 209 +++++- .../subjective/subjective-note.html | 133 ++-- .../templates/freetext/freetext.html | 6 +- .../app/clinical/clinical-shared-module.ts | 5 +- .../home-medication-add.component.ts | 6 +- .../medications/home-medication-add.html | 4 +- .../clinical/shared/clinical.dl.service.ts | 9 + .../shared/patient-clinical-details.vmodel.ts | 2 + .../src/app/clinical/shared/vitals.model.ts | 18 + .../src/app/clinical/vitals/vitals-add.html | 123 +++- .../dashboard/doctor-dashboard.component.ts | 2 - .../doctors/dashboard/doctor-dashboard.html | 4 - .../app/doctors/doctors-routing.constant.ts | 2 +- 27 files changed, 1991 insertions(+), 136 deletions(-) create mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.component.ts create mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.html delete mode 100644 Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts diff --git a/Code/Components/DanpheEMR.ServerModel/ClinicalModels/VitalsModel.cs b/Code/Components/DanpheEMR.ServerModel/ClinicalModels/VitalsModel.cs index 127b0c0d..c3d6a070 100644 --- a/Code/Components/DanpheEMR.ServerModel/ClinicalModels/VitalsModel.cs +++ b/Code/Components/DanpheEMR.ServerModel/ClinicalModels/VitalsModel.cs @@ -14,7 +14,7 @@ public class VitalsModel public int PatientVisitId { get; set; } //assign default value to this property, don't set it from anywhere else.. - + public double? Height { get; set; } public string HeightUnit { get; set; } public double? Weight { get; set; } @@ -41,5 +41,23 @@ public class VitalsModel public DateTime VitalsTakenOn { get; set; } public DateTime? ModifiedOn { get; set; } //public virtual PatientModel Patient { get; set; } + + public int? Nadi { get; set; } + public string Mala { get; set; } + public string Mutra { get; set; } + public string Jivha { get; set; } + public string Shabda { get; set; } + public string Sparsha { get; set; } + public string Drik { get; set; } + public string Akriti { get; set; } + public string LungField { get; set; } + public string HeartSounds { get; set; } + public string PA_Tenderness { get; set; } + public string Organomegaly { get; set; } + public string CNS_Consiousness { get; set; } + public string Power { get; set; } + public string Reflexes { get; set; } + public string Tone { get; set; } + public string Others { get; set; } } -} + } \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/Controllers/Clinical/ClinicalController.cs b/Code/Websites/DanpheEMR/Controllers/Clinical/ClinicalController.cs index 2a1b03d4..e3bccb2e 100644 --- a/Code/Websites/DanpheEMR/Controllers/Clinical/ClinicalController.cs +++ b/Code/Websites/DanpheEMR/Controllers/Clinical/ClinicalController.cs @@ -1009,6 +1009,119 @@ join item in dbContext.PHRMItemMaster on pres.ItemId equals item.ItemId responseData.Status = "OK"; responseData.Results = allICDandOrders; } + else if (reqType == "getopdExaminationById") + { + var opdExamination_NoteTypeId = (from noteType in dbContext.NoteType + where noteType.NoteType.ToLower() == ("OPD Examination").ToLower() + select noteType.NoteTypeId + ).FirstOrDefault(); + + var notes_Id = (from note in dbContext.Notes + + where note.PatientId == patientId && note.PatientVisitId == patientVisitId && note.NoteTypeId == opdExamination_NoteTypeId + select note.NotesId).FirstOrDefault(); + + + + var opdEx_Note = (from note in dbContext.Notes + join sNote in dbContext.SubjectiveNotes on note.NotesId equals sNote.NotesId into tempSubNote + from subjNote in tempSubNote.DefaultIfEmpty() + join obNote in dbContext.ObjectiveNotes on note.NotesId equals obNote.NotesId into tempObjNote + from objNote in tempObjNote.DefaultIfEmpty() + + join pat in dbContext.Patients on note.PatientId equals pat.PatientId + join primaryDoc in dbContext.Employee on note.ProviderId equals primaryDoc.EmployeeId + join sd in dbContext.Employee on note.SecondaryDoctorId equals sd.EmployeeId into secondaryDocTemp + from secondaryDoc in secondaryDocTemp.DefaultIfEmpty() + + join emp in dbContext.Employee on note.CreatedBy equals emp.EmployeeId + join nt in dbContext.NoteType on note.NoteTypeId equals nt.NoteTypeId into noteTypeTemp + from noteType in noteTypeTemp.DefaultIfEmpty() + + join daignosis in dbContext.ClinicalDiagnosis on note.NotesId equals daignosis.NotesId into tempdaignosis + from clnd in tempdaignosis.DefaultIfEmpty() + + join prescription in dbContext.ClinicalPrescriptionNote on note.NotesId equals prescription.NotesId into tempPre + from pre in tempPre.ToList() + where note.NotesId == notes_Id + select new + { + note.PatientId, + note.PatientVisitId, + note.NotesId, + note.IsPending, + note.FollowUp, + note.FollowUpUnit, + note.Remarks, + WrittenBy = emp.FullName, + noteType.NoteType, + PrimaryDoctor = primaryDoc.FullName, + SecondaryDoctor = secondaryDoc.FullName, + pat.Age, + Sex = pat.Gender, + PatientName = pat.FirstName + " " + (String.IsNullOrEmpty(pat.MiddleName) ? " " : pat.MiddleName) + " " + pat.LastName, + SubjectiveNote = subjNote, + ObjectiveNote = objNote, + Prescription = pre, + DiagnosisOrdersList = (from allDiagnosis in dbContext.ClinicalDiagnosis + where allDiagnosis.NotesId == NotesId && allDiagnosis.IsActive == true + select new + { + allDiagnosis.DiagnosisId, + IsEditable = true, + ICD = (from icd in dbContext.ICD10 + where icd.ICD10ID == allDiagnosis.ICD10ID + select new + { + icd.ICD10Code, + icd.ICD10Description, + icd.ICD10ID, + icd.ICDShortCode, + icd.ValidForCoding + }), + + + AllIcdLabOrders = (from allLab in dbContext.LabRequisitions + where allLab.DiagnosisId == allDiagnosis.DiagnosisId && allLab.OrderStatus != "cancel" + select new + { + ItemId = allLab.LabTestId, + ItemName = allLab.LabTestName, + PreferenceType = "Lab", + IsGeneric = false, + } + ).ToList(), + AllIcdImagingOrders = (from allImaging in dbContext.ImagingRequisitions + where allImaging.DiagnosisId == allDiagnosis.DiagnosisId && allImaging.OrderStatus != "cancel" + select new + { + ItemId = allImaging.ImagingItemId, + ItemName = allImaging.ImagingItemName, + allImaging.ImagingTypeId, + PreferenceType = "Imaging", + IsGeneric = false, + + }).ToList(), + AllIcdPrescriptionOrders = (from allMedication in dbContext.PHRMPrescriptionItems + where allMedication.DiagnosisId == allDiagnosis.DiagnosisId && allMedication.OrderStatus != "cancel" + select new + { + allMedication.ItemId, + dbContext.PHRMItemMaster.FirstOrDefault(item => allMedication.ItemId == item.ItemId).ItemName, + allMedication.Quantity, + allMedication.Frequency, + allMedication.HowManyDays, + allMedication.Dosage, + allMedication.GenericId, + PreferenceType = "Medication", + IsGeneric = false, + }).ToList(), + + }).ToList() + }).FirstOrDefault(); + responseData.Results = opdEx_Note; + responseData.Status = "OK"; + } else { responseData.Status = "Failed"; @@ -2787,6 +2900,220 @@ where dbc.ParameterGroupName.ToLower() == "clinical" } } } + else if (reqType == "postopdexamination") + { + string str = this.ReadPostData(); + NotesModel NotesMaster = JsonConvert.DeserializeObject(str); + using (var dbContextTransaction = dbContext.Database.BeginTransaction()) + { + try + { + NotesMaster.CreatedBy = currentUser.EmployeeId; + NotesMaster.CreatedOn = DateTime.Now; + dbContext.Notes.Add(NotesMaster); + dbContext.SaveChanges(); + var Notesid = NotesMaster.NotesId; + + SubjectiveNoteModel subjectiveNote = NotesMaster.SubjectiveNote; + ObjectiveNoteModel objectiveNote = NotesMaster.ObjectiveNote; + FreeTextNoteModel freetext = NotesMaster.FreeTextNote; + PrescriptionNotesModel prescription = NotesMaster.ClinicalPrescriptionNote; + ProcedureNoteModel procedure = NotesMaster.ProcedureNote; + + List clinialDiagnosis = NotesMaster.AllIcdAndOrders; + + if (subjectiveNote != null) + { + subjectiveNote.NotesId = Notesid; + subjectiveNote.PatientVisitId = NotesMaster.PatientVisitId; + subjectiveNote.PatientId = NotesMaster.PatientId; + subjectiveNote.CreatedBy = currentUser.EmployeeId; + subjectiveNote.CreatedOn = DateTime.Now; + subjectiveNote.IsActive = true; + dbContext.SubjectiveNotes.Add(subjectiveNote); + dbContext.SaveChanges(); + + } + if (objectiveNote != null) + { + objectiveNote.NotesId = Notesid; + objectiveNote.PatientVisitId = NotesMaster.PatientVisitId; + objectiveNote.PatientId = NotesMaster.PatientId; + objectiveNote.CreatedBy = currentUser.EmployeeId; + objectiveNote.CreatedOn = DateTime.Now; + objectiveNote.IsActive = true; + dbContext.ObjectiveNotes.Add(objectiveNote); + dbContext.SaveChanges(); + } + if (freetext != null) + { + freetext.NotesId = Notesid; + freetext.PatientVisitId = NotesMaster.PatientVisitId; + freetext.PatientId = NotesMaster.PatientId; + freetext.CreatedBy = currentUser.EmployeeId; + freetext.CreatedOn = DateTime.Now; + freetext.IsActive = true; + dbContext.FreeText.Add(freetext); + dbContext.SaveChanges(); + } + if (prescription != null) + { + prescription.NotesId = NotesMaster.NotesId; + prescription.CreatedBy = currentUser.EmployeeId; + prescription.CreatedOn = System.DateTime.Now; + dbContext.ClinicalPrescriptionNote.Add(prescription); + dbContext.SaveChanges(); + } + if (procedure !=null) + { + procedure.NotesId = Notesid; + procedure.PatientVisitId = NotesMaster.PatientVisitId; + procedure.PatientId = NotesMaster.PatientId; + procedure.CreatedBy = currentUser.EmployeeId; + procedure.CreatedOn = DateTime.Now; + procedure.IsActive = true; + dbContext.ProcedureNote.Add(procedure); + dbContext.SaveChanges(); + } + + if ((clinialDiagnosis != null) && clinialDiagnosis.Count > 0) + { + + List allBillRequisition = new List(); + var priceForLabRequisition = (from billItemPrice in dbContext.BillItemPrices + join servDept in dbContext.ServiceDepartments + on billItemPrice.ServiceDepartmentId equals servDept.ServiceDepartmentId + where servDept.IntegrationName == "LAB" + select new + { + ItemId = billItemPrice.ItemId, + ItemName = billItemPrice.ItemName, + Price = billItemPrice.Price, + ServiceDepartmentId = servDept.ServiceDepartmentId, + DepartmentName = servDept.ServiceDepartmentName + }).ToList(); + + var priceForRadRequisition = (from billItemPrice in dbContext.BillItemPrices + join servDept in dbContext.ServiceDepartments + on billItemPrice.ServiceDepartmentId equals servDept.ServiceDepartmentId + where servDept.IntegrationName == "Radiology" + select new + { + ItemId = billItemPrice.ItemId, + ItemName = billItemPrice.ItemName, + Price = billItemPrice.Price, + ServiceDepartmentId = servDept.ServiceDepartmentId, + DepartmentName = servDept.ServiceDepartmentName + }).ToList(); + + + BillItemRequisition RequisitionItem = new BillItemRequisition(); + + foreach (ClinicalDiagnosisModel Diagnosis in clinialDiagnosis) + { + Diagnosis.CreatedOn = DateTime.Now; + Diagnosis.CreatedBy = currentUser.EmployeeId; + Diagnosis.NotesId = NotesMaster.NotesId; + dbContext.ClinicalDiagnosis.Add(Diagnosis); + dbContext.SaveChanges(); + + + + foreach (LabRequisitionModel labReq in Diagnosis.AllIcdLabOrders) + { + labReq.CreatedBy = currentUser.EmployeeId; + labReq.CreatedOn = DateTime.Now; + labReq.DiagnosisId = Diagnosis.DiagnosisId; + dbContext.LabRequisitions.Add(labReq); + dbContext.SaveChanges(); + + var itemDetail = (from labPrice in priceForLabRequisition + where labPrice.ItemId == labReq.LabTestId + select labPrice).FirstOrDefault(); + + + RequisitionItem = new BillItemRequisition(); + RequisitionItem.RequisitionId = labReq.RequisitionId; + RequisitionItem.BillStatus = labReq.BillingStatus; + RequisitionItem.PatientId = labReq.PatientId; + RequisitionItem.PatientVisitId = labReq.PatientVisitId.Value; + RequisitionItem.ProviderId = labReq.ProviderId.Value; + RequisitionItem.ServiceDepartmentId = itemDetail.ServiceDepartmentId; + RequisitionItem.DepartmentName = itemDetail.DepartmentName; + RequisitionItem.ItemId = itemDetail.ItemId; + RequisitionItem.ItemName = itemDetail.ItemName; + RequisitionItem.Price = itemDetail.Price; + RequisitionItem.Quantity = 1; + RequisitionItem.ProcedureCode = labReq.ProcedureCode; + RequisitionItem.CreatedBy = currentUser.EmployeeId; + RequisitionItem.CreatedOn = DateTime.Now; + + allBillRequisition.Add(RequisitionItem); + } + + foreach (ImagingRequisitionModel imgnRequisition in Diagnosis.AllIcdImagingOrders) + { + imgnRequisition.CreatedBy = currentUser.EmployeeId; + imgnRequisition.CreatedOn = DateTime.Now; + imgnRequisition.DiagnosisId = Diagnosis.DiagnosisId; + dbContext.ImagingRequisitions.Add(imgnRequisition); + dbContext.SaveChanges(); + + var itemDetail = (from radPrice in priceForRadRequisition + where radPrice.ItemId == imgnRequisition.ImagingItemId + select radPrice).FirstOrDefault(); + + + RequisitionItem = new BillItemRequisition(); + RequisitionItem.RequisitionId = imgnRequisition.ImagingRequisitionId; + RequisitionItem.BillStatus = imgnRequisition.BillingStatus; + RequisitionItem.PatientId = imgnRequisition.PatientId; + RequisitionItem.PatientVisitId = imgnRequisition.PatientVisitId.Value; + RequisitionItem.ProviderId = imgnRequisition.ProviderId.Value; + RequisitionItem.ServiceDepartmentId = itemDetail.ServiceDepartmentId; + RequisitionItem.DepartmentName = itemDetail.DepartmentName; + RequisitionItem.ItemId = itemDetail.ItemId; + RequisitionItem.ItemName = itemDetail.ItemName; + RequisitionItem.Price = itemDetail.Price; + RequisitionItem.Quantity = 1; + RequisitionItem.ProcedureCode = imgnRequisition.ProcedureCode; + RequisitionItem.CreatedBy = currentUser.EmployeeId; + RequisitionItem.CreatedOn = DateTime.Now; + + allBillRequisition.Add(RequisitionItem); + } + + foreach (PHRMPrescriptionItemModel phrmRequisition in Diagnosis.AllIcdPrescriptionOrders) + { + phrmRequisition.CreatedBy = currentUser.EmployeeId; + phrmRequisition.CreatedOn = DateTime.Now; + phrmRequisition.DiagnosisId = Diagnosis.DiagnosisId; + dbContext.PHRMPrescriptionItems.Add(phrmRequisition); + dbContext.SaveChanges(); + } + + } + foreach (BillItemRequisition bill in allBillRequisition) + { + dbContext.BillItemRequisitions.Add(bill); + } + dbContext.SaveChanges(); + } + + dbContextTransaction.Commit(); + responseData.Status = "OK"; + + } + catch (Exception ex) + { + //Rollback all transaction if exception occured + dbContextTransaction.Rollback(); + responseData.Status = "Failed"; + throw ex; + } + + } + } else { responseData.Status = "Failed"; diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html index 33f4d0d8..cb7ed98b 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html @@ -44,30 +44,189 @@ font-weight: bold; } -
+
- - +
+
+
+
+
Clinical Notes
+
+
+
+
Diagnosis(ICD 10 code)
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+

Lab and Orders

+
+
+
+
Lab and Orders
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ Lab +
+ +
+ + + + {{itm.ItemName}} + + +
+
+
+ +
+
+
+ Imaging +
+ +
+ + + + {{itm.ItemName}} + + +
+
+
+ +
+
+
+ Others +
+ +
+ + + + {{itm.ItemName}} + + +
+
+
+
+ +
+
+
+
+
- - +
+
+
+ +
- +
+ + + +
@@ -125,4 +284,42 @@

Instructions

+
+
+
+ +
+
+ +
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
X
+
+ +
+
Print  
+
+
+
+
+
+
\ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts index ef8e61d8..40d2f0db 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts @@ -1,4 +1,4 @@ -import { Component, Output, EventEmitter, Input } from "@angular/core"; +import { Component, Output, EventEmitter, Input, ChangeDetectorRef } from "@angular/core"; import * as moment from 'moment/moment'; import { Patient } from "../../patients/shared/patient.model"; import { Visit } from "../../appointments/shared/visit.model"; @@ -11,7 +11,20 @@ import { CoreService } from "../../core/shared/core.service"; import { NoteTemplateBLService } from "../shared/note-template.bl.service"; import { PatientService } from "../../patients/shared/patient.service"; import { PatientOrderListModel } from "../../clinical/shared/order-list.model"; -import { OPDExaminationModel } from "../shared/OPD-Examination.model"; +import { OrderService } from "../../orders/shared/order.service"; +import { LabTestRequisition } from "../../labs/shared/lab-requisition.model"; +import { ImagingItemRequisition } from "../../radiology/shared/imaging-item-requisition.model"; +import { PHRMPrescriptionItem } from "../../pharmacy/shared/phrm-prescription-item.model"; +import { SecurityService } from "../../security/shared/security.service"; +import { PHRMItemMasterModel } from "../../pharmacy/shared/phrm-item-master.model"; +import { PHRMGenericModel } from "../../pharmacy/shared/phrm-generic.model"; +import { ClinicalPrescriptionNotesModel } from "../shared/clinical-prescription-note.model"; +import { DanpheCache, MasterType } from "../../shared/danphe-cache-service-utility/cache-services"; +import { ICD10 } from "../../clinical/shared/icd10.model"; +import { DanpheHTTPResponse } from "../../shared/common-models"; +import { OrderItemsVM } from "../../orders/shared/orders-vms"; +import { CommonFunctions } from "../../shared/common.functions"; +import { HttpHeaders, HttpClient } from "@angular/common/http"; @Component({ selector: "OPD-Examination", @@ -21,15 +34,22 @@ import { OPDExaminationModel } from "../shared/OPD-Examination.model"; export class OPDExaminationComponent{ public pat: Patient = new Patient(); public patVisit: Visit = new Visit(); + + public notes: NotesModel = new NotesModel(); public date: string = null; public selectedDepartment: any = null; - public notes: NotesModel = new NotesModel(); public FollowUp = { Number: 0, Unit: 'Days', } public clinicalDetail: PatientClinicalDetail = new PatientClinicalDetail(); - + //Diagnosis + @Input("prescriptionNote") + public prescriptionNotes: ClinicalPrescriptionNotesModel = new ClinicalPrescriptionNotesModel(); + public ICD10List = []; + @Input("notesId") + public notesId: number; + public update: boolean = false; @Output() public outPutHpNote: EventEmitter = new EventEmitter(); public assessment: AssessmentAndPlanModel = new AssessmentAndPlanModel(); @@ -38,20 +58,74 @@ export class OPDExaminationComponent{ public assessmentForEdit: any; public showSOnotes: boolean = false; public showExamination : boolean = true; + public showAllergyAddBox: boolean = false; //@input-allergy + public showFreeText: boolean = false; + public freetextnotes: any = null; + public selectedSecondaryDoctor: any = ""; + public mappedLabItems: Array = []; + public mappedImagingItems: Array = []; + public mappedPrescriptionItems: Array = []; + public templateList: any = ""; + public noteTypeList: any; + public NoteType : string=""; + public showView :boolean = false; + + public allOrdItems: Array = []; + public ordItemsFiltered: Array = []; + public itemsType: Array = []; + public selItemType: string = "All"; + public selOrdItem: any = null; + public options = { + headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }) + }; + isVisitConcluded = false; + @Input("patientVisitId") + public patientVisitId: number; constructor(public visitService: VisitService, public msgBoxServ: MessageboxService, public coreService: CoreService, public notetemplateBLService: NoteTemplateBLService, - public patientService: PatientService) { + public patientService: PatientService, + public changeDetector: ChangeDetectorRef, + public ordServ: OrderService, + public securityService: SecurityService, + public http: HttpClient) { this.pat = this.patientService.globalPatient; this.patVisit = this.visitService.globalVisit, this.date = moment().format("YYYY-MM-DD,h:mm:ss a"); + this.GetICDList(); + this.LoadAllOrderItems(); + this.GetNoteTypeList() + this.GetTemplateList(); + this.getNoteType(); + } + ngOnInit() { + if (this.notesId) { + this.update = true; + if (this.prescriptionNotes && this.prescriptionNotes.ICDSelected && this.prescriptionNotes.ICDSelected.trim().length) { + this.prescriptionNotes.ICDList = JSON.parse(this.prescriptionNotes.ICDSelected); + } else { + this.AddNewICDRow(); + } + + if (this.prescriptionNotes && this.prescriptionNotes.OrdersSelected && this.prescriptionNotes.OrdersSelected.trim().length) { + this.prescriptionNotes.SelectedOrderItems = JSON.parse(this.prescriptionNotes.OrdersSelected); + } + + } else { + this.AddNewICDRow(); + this.update = false + } + } + + getNoteType(){ + var paramValue = this.coreService.Parameters.find(a => a.ParameterGroupName == "Clinical" && a.ParameterName == "DefaultNotesType_OPDExamination").ParameterValue; + if (paramValue){ + this.NoteType = paramValue; + + } } - @Input('OPD-Examination') - public opdExamination: OPDExaminationModel = new OPDExaminationModel(); - @Output("Examination") - Examination: EventEmitter = new EventEmitter(); @Input('editHpNote') public set HpNote(hpNote: any) { if (this.notetemplateBLService.NotesId != 0) { @@ -154,12 +228,23 @@ export class OPDExaminationComponent{ //console.log(this.notes.EmergencyNote.SubjectiveNote); this.outPutHpNote.emit(this.notes); } + CallBackProcedureNotes($event) { + this.notes.ProcedureNote = $event.prescriptionNote; + //console.log(this.notes.EmergencyNote.SubjectiveNote); + this.outPutHpNote.emit(this.notes); + } CallBackObjective($event) { this.notes.ObjectiveNote = $event.objectivenote; //console.log(this.notes.EmergencyNote.ObjectiveNote); this.outPutHpNote.emit(this.notes); } + CallBackView($event) { + if ($event.Data.TemplateName == this.NoteType) { + this.showView = true; + this.notetemplateBLService.NotesId = $event.Data.NotesId; + } + } CallBackAssesmentAndPlan(data) { console.log("from assessment orders:"); @@ -167,11 +252,503 @@ export class OPDExaminationComponent{ this.notes.ClinicalDiagnosis = data; this.outPutHpNote.emit(this.notes); } - Close() { - this.showExamination=false; - this.Examination.emit({ action: "balance-History"}); - // this.patientInfo = null; - } + CallBackAddAllergy($event) { //@output + if ($event && $event.allergy) { + this.clinicalDetail.Allergies.push($event.allergy); + } + this.showAllergyAddBox = false; + this.changeDetector.detectChanges(); +} +CallBackFreeTexts($event) { + this.notes.FreeTextNote= $event.freetexts; + + console.log(this.freetextnotes); + +} +SubmitTemplate(value) { + if (value == 1) { // 1 --> Submit Button --> incase Note is not pending (Created; not Updated) + this.notes.IsPending = false; + var view: boolean; + view = window.confirm("Want to Submit Note? You won't be able to edit or update note in future ! Click Save button if you want to change Note in future !"); + if (view) { // confirming before final submit of Note + + this.PostTemplate(); + } + } + if (value == 0) { // 0 --> Save Button --> incase Note is pending (Created; not Updated) + this.notes.IsPending = true; + this.PostTemplate(); + } +} +PostTemplate() { + if (this.visitService.globalVisit.ConcludeDate) { + this.isVisitConcluded = true; + this.msgBoxServ.showMessage("Warning", ["This Visit is concluded"]); + } else { + this.isVisitConcluded = false; + + this.notes.ClinicalPrescriptionNote.PatientId = this.patVisit.PatientId; + this.notes.ClinicalPrescriptionNote.PatientVisitId = this.patVisit.PatientVisitId; + this.notes.SecondaryDoctorId = this.selectedSecondaryDoctor ? this.selectedSecondaryDoctor.ProviderId : null; + this.notes.ProviderId = this.patVisit.ProviderId ? this.patVisit.ProviderId : 0; + this.notes.ClinicalPrescriptionNote.OrdersSelected = JSON.stringify(this.prescriptionNotes.SelectedOrderItems); + this.notes.ClinicalPrescriptionNote.ICDSelected = JSON.stringify(this.prescriptionNotes.ICDList); + + this.notes.PatientId = this.patVisit.PatientId; + this.notes.PatientVisitId = this.patVisit.PatientVisitId; + this.notes.TemplateId = this.templateList.find(temp=>temp.TemplateName == this.NoteType).TemplateId; + this.notes.NoteTypeId = this.noteTypeList.find(type => type.NoteType == this.NoteType).NoteTypeId; + //Logic for Posting History and Physical Note + + if (this.notes.ClinicalDiagnosis) { + this.MapAllOrdersAndAssign(); + } + + if (this.notes.IsPending) { // if notes are are pending then, empty fields are allowed to post + this.PostHistoryAndPhysical(); + } else { + if (this.notes.SubjectiveNote && this.notes.ObjectiveNote && this.notes.AllIcdAndOrders.length > 0 && this.notes.FreeTextNote) { + + this.PostHistoryAndPhysical(); + } else { + this.msgBoxServ.showMessage("Warning", ["Submit can't be done with all fields empty !"]); + } + } +} +} +MapAllOrdersAndAssign() { + + if (this.notes.ClinicalDiagnosis.DiagnosisOrdersList && this.notes.ClinicalDiagnosis.DiagnosisOrdersList.length > 0) { + + var allLabTests = this.ordServ.allLabtests; //check if there is runnumbertype or not, if not get it as well + var allImgItems = this.ordServ.allImagingItems; + var allMedItms = this.ordServ.allMedicationItems; + //var defaultMed = new PHRMPrescriptionItem(); + + this.notes.ClinicalDiagnosis.DiagnosisOrdersList.forEach(itm => { + + if (itm.RemovedOrdersList.length > 0) { + this.notes.ClinicalDiagnosis.RemovedDiagnosisOrdersList.push(itm); + } + if (itm.IsEditable) { + this.mappedLabItems = []; + this.mappedImagingItems = []; + this.mappedPrescriptionItems = []; + + itm.OrdersList.forEach(odr => { + if (odr.Order.PreferenceType.toLowerCase() == 'lab') { + + let labTest = allLabTests.find(test => test.LabTestId == odr.Order.ItemId); + let currReq = new LabTestRequisition(); + + currReq.LabTestId = labTest.LabTestId; + currReq.LabTestName = labTest.LabTestName; + currReq.LabTestSpecimen = labTest.LabTestSpecimen; + currReq.LabTestSpecimenSource = labTest.LabTestSpecimenSource; + currReq.ProcedureCode = labTest.ProcedureCode; + //Lonic Code should come from database.....but for now it is hard coded value + currReq.LOINC = "LONIC Code"; + currReq.OrderStatus = "active"; + currReq.BillingStatus = "unpaid"; + currReq.RunNumberType = labTest.RunNumberType; + //currReq.VisitType = this.patService.globalPatient.LatestVisitType.toLowerCase(); + currReq.PatientId = this.patientService.globalPatient.PatientId; + currReq.PatientName = this.patientService.globalPatient.FirstName + " " + this.patientService.globalPatient.LastName; + currReq.PatientVisitId = this.visitService.globalVisit.PatientVisitId; + currReq.ProviderName = this.visitService.globalVisit.ProviderName; + currReq.ProviderId = this.visitService.globalVisit.ProviderId; + currReq.CreatedBy = this.securityService.GetLoggedInUser().EmployeeId; + currReq.CreatedOn = moment().format('YYYY-MM-DD HH:mm:ss'); + currReq.DiagnosisId = itm.DiagnosisId; + + this.mappedLabItems.push(currReq); + } + else if (odr.Order.PreferenceType.toLowerCase() == 'imaging') { + let imgItem = allImgItems.find(test => test.ImagingItemId == odr.Order.ItemId); + let currReq = new ImagingItemRequisition(); + + currReq.ImagingItemId = imgItem.ImagingItemId; + currReq.ImagingItemName = imgItem.ImagingItemName; + currReq.ImagingTypeId = imgItem.ImagingTypeId; + currReq.ProcedureCode = imgItem.ProcedureCode; + currReq.PatientId = this.patientService.globalPatient.PatientId; + currReq.PatientVisitId = this.visitService.globalVisit.PatientVisitId; + currReq.ProviderName = this.visitService.globalVisit.ProviderName; + currReq.ProviderId = this.visitService.globalVisit.ProviderId; + currReq.OrderStatus = "active"; + currReq.DiagnosisId = itm.DiagnosisId; + currReq.BillingStatus = "unpaid"; //see this billing status for Radiology patient + this.mappedImagingItems.push(currReq); + } + else { + let currMed = new PHRMItemMasterModel(); + let currGeneric = new PHRMGenericModel(); + + //incase of generic, we have GenericId as Itemid. + if (odr.Order.IsGeneric) { + currGeneric = this.ordServ.allGenericItems.find(gen => gen.GenericId == odr.Order.ItemId); + } else { + currMed = allMedItms.find(med => med.ItemId == odr.Order.ItemId); + currGeneric = this.ordServ.allGenericItems.find(gen => gen.GenericId == odr.Order.GenericId); + } + + let newReq = new PHRMPrescriptionItem(); + + newReq.ItemId = currMed.ItemId; + newReq.CreatedBy = this.securityService.GetLoggedInUser().EmployeeId; + newReq.CreatedOn = moment().format('YYYY-MM-DD HH:mm:ss'); + newReq.Frequency = odr.Frequency ? odr.Frequency : 0; + newReq.HowManyDays = odr.Duration ? odr.Duration : 0; + newReq.ItemName = odr.Order.ItemName; + newReq.PatientId = this.patientService.globalPatient.PatientId; + newReq.Dosage = odr.Dosage ? odr.Dosage : currMed.Dosage;//if current item has dosage, then fill it as it is. + newReq.Notes = odr.Remarks ? odr.Remarks : ""; + newReq.OrderStatus = "active"; + newReq.Route = odr.Route ? odr.Route : "mouth"; + newReq.ProviderId = this.visitService.globalVisit.ProviderId; + newReq.GenericId = currGeneric ? currGeneric.GenericId : 0; + newReq.GenericName = currGeneric ? currGeneric.GenericName : ''; + newReq.Quantity = newReq.Frequency * newReq.HowManyDays; + newReq.PHRMPrescriptionItemsValidator = null; + newReq.DiagnosisId = itm.DiagnosisId; + + this.mappedPrescriptionItems.push(newReq); + } + }); + + this.notes.AllIcdAndOrders.push({ + DiagnosisId: itm.DiagnosisId, + NotesId: this.notes.NotesId, + PatientId: this.patVisit.PatientId, + PatientVisitId: this.patVisit.PatientVisitId, + ICD10ID: itm.ICD.ICD10ID, + ICD10Code: itm.ICD.ICD10Code, + ICD10Description: itm.ICD.ICD10Description, + AllIcdLabOrders: this.mappedLabItems, + AllIcdImagingOrders: this.mappedImagingItems, + AllIcdPrescriptionOrders: this.mappedPrescriptionItems, + CreatedBy: null, + ModifiedBy: null, + CreatedOn: null, + ModifiedOn: null, + IsActive: itm.IsActive, + }); + } + }); + } + + // for mapping removed icd-orders + if (this.notes.ClinicalDiagnosis.RemovedDiagnosisOrdersList && this.notes.ClinicalDiagnosis.RemovedDiagnosisOrdersList.length > 0) { + + var allLabTests = this.ordServ.allLabtests; //check if there is runnumbertype or not, if not get it as well + var allImgItems = this.ordServ.allImagingItems; + var allMedItms = this.ordServ.allMedicationItems; + //var defaultMed = new PHRMPrescriptionItem(); + + this.notes.ClinicalDiagnosis.RemovedDiagnosisOrdersList.forEach(itm => { + + if (itm.IsEditable) { + this.mappedLabItems = []; + this.mappedImagingItems = []; + this.mappedPrescriptionItems = []; + + itm.RemovedOrdersList.forEach(odr => { + if (odr.Order.PreferenceType.toLowerCase() == 'lab') { + + let labTest = allLabTests.find(test => test.LabTestId == odr.Order.ItemId); + let currReq = new LabTestRequisition(); + + currReq.LabTestId = labTest.LabTestId; + currReq.LabTestName = labTest.LabTestName; + currReq.LabTestSpecimen = labTest.LabTestSpecimen; + currReq.LabTestSpecimenSource = labTest.LabTestSpecimenSource; + currReq.ProcedureCode = labTest.ProcedureCode; + //Lonic Code should come from database.....but for now it is hard coded value + currReq.LOINC = "LONIC Code"; + currReq.OrderStatus = "active"; + currReq.BillingStatus = "unpaid"; + currReq.RunNumberType = labTest.RunNumberType; + //currReq.VisitType = this.patService.globalPatient.LatestVisitType.toLowerCase(); + currReq.PatientId = this.patientService.globalPatient.PatientId; + currReq.PatientName = this.patientService.globalPatient.FirstName + " " + this.patientService.globalPatient.LastName; + currReq.PatientVisitId = this.visitService.globalVisit.PatientVisitId; + currReq.ProviderName = this.visitService.globalVisit.ProviderName; + currReq.ProviderId = this.visitService.globalVisit.ProviderId; + currReq.CreatedBy = this.securityService.GetLoggedInUser().EmployeeId; + currReq.DiagnosisId = itm.DiagnosisId; + currReq.CreatedOn = moment().format('YYYY-MM-DD HH:mm:ss'); + this.mappedLabItems.push(currReq); + } + else if (odr.Order.PreferenceType.toLowerCase() == 'imaging') { + let imgItem = allImgItems.find(test => test.ImagingItemId == odr.Order.ItemId); + let currReq = new ImagingItemRequisition(); + + currReq.ImagingItemId = imgItem.ImagingItemId; + currReq.ImagingItemName = imgItem.ImagingItemName; + currReq.ImagingTypeId = imgItem.ImagingTypeId; + currReq.ProcedureCode = imgItem.ProcedureCode; + currReq.PatientId = this.patientService.globalPatient.PatientId; + currReq.PatientVisitId = this.visitService.globalVisit.PatientVisitId; + currReq.ProviderName = this.visitService.globalVisit.ProviderName; + currReq.ProviderId = this.visitService.globalVisit.ProviderId; + currReq.OrderStatus = "active"; + currReq.DiagnosisId = itm.DiagnosisId; + currReq.BillingStatus = "unpaid"; //see this billing status for Radiology patient + this.mappedImagingItems.push(currReq); + } + else { + let currMed = new PHRMItemMasterModel(); + let currGeneric = new PHRMGenericModel(); + + //incase of generic, we have GenericId as Itemid. + if (odr.Order.IsGeneric) { + currGeneric = this.ordServ.allGenericItems.find(gen => gen.GenericId == odr.Order.ItemId); + } else { + currMed = allMedItms.find(med => med.ItemId == odr.Order.ItemId); + currGeneric = this.ordServ.allGenericItems.find(gen => gen.GenericId == odr.Order.GenericId); + } + + let newReq = new PHRMPrescriptionItem(); + + newReq.ItemId = currMed.ItemId; + newReq.CreatedBy = this.securityService.GetLoggedInUser().EmployeeId; + newReq.CreatedOn = moment().format('YYYY-MM-DD HH:mm:ss'); + newReq.Frequency = odr.Frequency ? odr.Frequency : 0; + newReq.HowManyDays = odr.Duration ? odr.Duration : 0; + newReq.ItemName = odr.Order.ItemName; + newReq.PatientId = this.patientService.globalPatient.PatientId; + newReq.Dosage = odr.Dosage ? odr.Dosage : currMed.Dosage;//if current item has dosage, then fill it as it is. + newReq.Notes = odr.Remarks ? odr.Remarks : ""; + newReq.OrderStatus = "active"; + newReq.Route = odr.Route ? odr.Route : "mouth"; + newReq.ProviderId = this.visitService.globalVisit.ProviderId; + newReq.GenericId = currGeneric ? currGeneric.GenericId : 0; + newReq.GenericName = currGeneric ? currGeneric.GenericName : ''; + newReq.Quantity = newReq.Frequency * newReq.HowManyDays; + newReq.PHRMPrescriptionItemsValidator = null; + newReq.DiagnosisId = itm.DiagnosisId; + + this.mappedPrescriptionItems.push(newReq); + } + }); + + this.notes.RemovedIcdAndOrders.push({ + DiagnosisId: itm.DiagnosisId, + NotesId: this.notes.NotesId, + PatientId: this.patVisit.PatientId, + PatientVisitId: this.patVisit.PatientVisitId, + ICD10ID: itm.ICD.ICD10ID, + ICD10Code: itm.ICD.ICD10Code, + ICD10Description: itm.ICD.ICD10Description, + AllIcdLabOrders: this.mappedLabItems, + AllIcdImagingOrders: this.mappedImagingItems, + AllIcdPrescriptionOrders: this.mappedPrescriptionItems, + CreatedBy: null, + ModifiedBy: null, + CreatedOn: null, + ModifiedOn: null, + IsActive: itm.IsActive, + }); + } + }); + } + +} + //Post function handling History and Physical Note + public PostHistoryAndPhysical() { + + this.notetemplateBLService.PostOpdExamination(this.notes) + .subscribe(res => { + if (res.Status == "OK") { + this.msgBoxServ.showMessage("Success", ["OPD Examination done successfully."]); + // this.RouteToViewNotes(); + } + else { + this.msgBoxServ.showMessage("Failed", ["Error in Posting OPD Examination"]); + console.log(res.ErrorMessage); + } + }); + } + +public GetNoteTypeList() { + try { + + this.notetemplateBLService.GetNoteTypeList() + .subscribe(res => { + if (res.Status == "OK") { + if (res.Results.length) { + + this.noteTypeList = res.Results; + + } + else { + console.log(res.Errors); + } + } + }); + + } catch (exception) { + this.msgBoxServ.showMessage("Error", [exception]); + } +} +public GetTemplateList() { + try { + + this.notetemplateBLService.GetAllTemplateList() + .subscribe(res => { + if (res.Status == "OK") { + if (res.Results.length) { + this.templateList = res.Results; + } + else { + // console.log(res.Errors); + } + } + }); + + } catch (exception) { + this.msgBoxServ.showMessage("Error", [exception]); + } +} +public DeleteRow(ind: number) { + this.prescriptionNotes.ICDList.splice(ind, 1); +} +public GetICDList() { + this.ICD10List = DanpheCache.GetData(MasterType.ICD, null); +} +LoadAllOrderItems() { + this.http.get('/api/Orders?reqType=allOrderItems', this.options).map(res => res) + .subscribe((res: DanpheHTTPResponse) => { + if (res.Status == "OK") { + this.allOrdItems = res.Results.filter(d => d.PreferenceType.toLowerCase() != 'medication'); + + this.allOrdItems.forEach(itm => { + itm.IsSelected = false; + itm.FormattedName = itm.Type + "-" + itm.ItemName; + }); + + this.GenerateItemTypes(); + } + else { + this.msgBoxServ.showMessage("failed", ['Failed. please check log for details.'], res.ErrorMessage); + } + }); +} + + +GenerateItemTypes() { + let allItmsType = this.allOrdItems.map(itm => { + return itm.PreferenceType; + }); + this.itemsType = CommonFunctions.GetUniqueItemsFromArray(allItmsType); + this.itemsType.unshift("All");//add default itemstype to the beginning of array. + + this.ordItemsFiltered = Object.assign([], this.allOrdItems); +} + +ItemsTypeOnChange() { + if (this.selItemType && (this.selItemType != "All")) { + this.ordItemsFiltered = this.allOrdItems.filter(itm => itm.PreferenceType.toLowerCase() == this.selItemType.toLowerCase()); + } + else { + this.ordItemsFiltered = Object.assign([], this.allOrdItems); + } +} +OrderItemValueChanged() { + if (this.selOrdItem && this.selOrdItem.ItemId) { + let oditem = Object.assign({}, this.selOrdItem); + this.AddNewItemToOrders(oditem); + } + this.changeDetector.detectChanges(); + this.selOrdItem = ''; +} +AddNewItemToOrders(item) { + item.IsSelected = true; + let alreadyExists = this.prescriptionNotes.SelectedOrderItems.filter(itm => itm.Type == item.Type && itm.ItemId == item.ItemId).length; + if (!alreadyExists) { + this.prescriptionNotes.SelectedOrderItems.unshift(item); + } +} + +RemoveOrderItem(item) { + item.IsSelected = false; + let itmIndex = this.prescriptionNotes.SelectedOrderItems.findIndex(itm => itm.Type == item.Type && itm.ItemId == item.ItemId); + this.prescriptionNotes.SelectedOrderItems.splice(itmIndex, 1); +} +orderItemsListFormatter(data: any): string { + let isGeneric = data["IsGeneric"]; + let retHtml = ""; + + + if (!isGeneric) { + let dosage = data["Dosage"]; + let freq = data["FreqInWords"]; + + + retHtml = data["ItemName"] + "|" + data["GenericName"] + "|" + (dosage != null && dosage != "" ? dosage : "Dose:NA") + "|" + (freq != null && freq != "" ? freq : "Frequency:NA" + " | Available Quantity: " + data["AvailableQuantity"]); + // retHtml = "(" + data["Type"] + ")" + "" + data["ItemName"] + ""; + } + else { + retHtml = "(" + data["Type"] + ")" + data["ItemName"] + " | Available Quantity: " + data["AvailableQuantity"]; + } + + return retHtml; +} +ICDListFormatter(data: any): string { + let html; + //if the ICD is not valid for coding then it will be displayed as bold. + //needs to disable the field that are not valid for coding as well. + if (!data.ValidForCoding) { + html = "" + data["ICD10Code"] + " " + data["ICD10Description"] + ""; + } + else { + html = data["ICD10Code"] + " " + data["ICD10Description"]; + } + return html; +} +public AddNewICDRow() { + let newicd: ICD10 = Object.assign({},new ICD10()); + newicd.ICD10Description = ''; + this.prescriptionNotes.ICDList.push(newicd); + + let new_index = this.prescriptionNotes.ICDList.length - 1; + if (new_index > 0) { + window.setTimeout(function () { + let itmNameBox = document.getElementById('icd10-box' + new_index); + if (itmNameBox) { + itmNameBox.focus(); + } + }, 500); + } +} +print(){ + this.patientVisitId = this.patVisit.PatientVisitId +this.showView = true; +} +printTemplate(id: string = 'print-template') { + let popupWinindow; + var printContents = document.getElementById(id).innerHTML; + popupWinindow = window.open( + "", + "_blank", + "width=1600,height=900,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no" + ); + popupWinindow.document.open(); + popupWinindow.document.write( + ` + + + ` + + printContents + + "" + ); + + popupWinindow.document.close(); +} +Close(){ + this.showView = false; +} + } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.component.ts new file mode 100644 index 00000000..06828bbf --- /dev/null +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.component.ts @@ -0,0 +1,86 @@ +import { Component, OnInit, OnDestroy, Input, EventEmitter, Output } from "@angular/core"; +import { NoteTemplateBLService } from "../shared/note-template.bl.service"; +import { MessageboxService } from "../../shared/messagebox/messagebox.service"; +import { CoreService } from "../../core/shared/core.service"; +import { PatientService } from "../../patients/shared/patient.service"; +import { VisitService } from "../../appointments/shared/visit.service"; + +//@Component({ +// selector: "view-history-and-physical-note", +// templateUrl: "./view-history-and-physical-note.html", +//}) + +@Component({ + selector: "opd-examination-view", + templateUrl: "./opd-examination-view.html" +}) + +export class OpdexaminationViewComponent { + public hpNote: any=null; + public subjectiveNote: any=null; + public objectiveNote: any=null; + public diagnosisOrderList: Array = null; + public freeText:any = null; + public Prescription : any = null; + public OrdersList: Array = []; + public headerDetail: { header1, header2, header3, header4, hospitalName; address; email; PANno; tel; DDA }; + public pat :number=0; + public patVisit:number=0; + + @Input("patientVisitId") + public patientVisitId: number; + @Output("callback-view") + public CallBackView: EventEmitter = new EventEmitter(); + constructor(public noteTemplateBLService: NoteTemplateBLService, + public msgBoxServ: MessageboxService, + public coreService: CoreService, + public patientService:PatientService, + public visitService:VisitService) { + this.pat = this.patientService.getGlobal().PatientId; + this.patVisit = this.visitService.getGlobal().PatientVisitId; + this.GetHeaderParameter(); + this.getOpdExaminationData() + + } +getOpdExaminationData(){ + //if ( > 0) { + this.noteTemplateBLService.GetOpdExaminationdetailsById(this.pat,this.patVisit). + subscribe((res) => { + + if (res.Status == "OK" && res.Results) { + this.hpNote = res.Results; + this.subjectiveNote = this.hpNote.SubjectiveNote; + this.objectiveNote = this.hpNote.ObjectiveNote; + this.diagnosisOrderList = this.hpNote.DiagnosisOrdersList; + this.Prescription = this.hpNote.Prescription; + if (this.Prescription && this.Prescription.OrdersSelected) { + this.OrdersList = JSON.parse(this.Prescription.OrdersSelected); + } + if(this.Prescription && this.Prescription.ICDSelected){ + this.diagnosisOrderList = JSON.parse(this.Prescription.ICDSelected) + } + console.log(this.hpNote); + console.log(this.diagnosisOrderList); + } + }); + //} +} + + GetHeaderParameter() { + var paramValue = this.coreService.Parameters.find( + (a) => a.ParameterName == "CustomerHeader" + ).ParameterValue; + if (paramValue) this.headerDetail = JSON.parse(paramValue); + else + this.msgBoxServ.showMessage("error", [ + "Please enter parameter values for CustomerHeader", + ]); + } + ngOnDestroy() { + this.noteTemplateBLService.NotesId = 0; + } + +} + + + diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.html new file mode 100644 index 00000000..612a6adf --- /dev/null +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.html @@ -0,0 +1,163 @@ + + + +
+ +
+ +
+
{{headerDetail.hospitalName}}
+ {{headerDetail.address}}
+ PAN no: {{headerDetail.PANno}} , Tel: {{ headerDetail.tel}}
+ Clinical Unit
+
+
+
+
+ +
+
+ +
+
+
+

Patient Name:{{hpNote.PatientName}}

+

Primary Doctor:{{hpNote.PrimaryDoctor}}

+

Secondary Doctor:{{hpNote.SecondaryDoctor}}

+

Age/ Sex:{{hpNote.Age}}/{{hpNote.Sex}}

+

Written By:{{hpNote.WrittenBy}}

+

Date: {{hpNote.CreatedOn | date:'yyyy-MM-dd'}}

+

Note Type:{{hpNote.NoteType}}

+

Start Time :{{hpNote.CreatedOn |date: 'dd-MM-yyyy h:mm:ss'}}

+

Finish Time:{{hpNote.ModifiedOn |date: 'dd-MM-yyyy h:mm:ss'}}

+
+
+
+ +

Subjective Notes

+
+

Chief Complaint: {{subjectiveNote.ChiefComplaint}}

+

History Of Presenting Illness: {{subjectiveNote.HistoryOfPresentingIllness}}

+

Review Of Systems: {{subjectiveNote.ReviewOfSystems}}

+
+
+
+
+
+

Clinical Notes

+
+
+ {{note.Prescription.PrescriptionNoteText}} +
+
+
+
Diagnosis(ICD 10 code)
+
+
+
+ {{i+1}}) {{icd.ICD10Description}} +
+
+
+
+
+
+ +

Objective Notes

+
+

HEENT: {{objectiveNote.HEENT}}

+

Chest : {{objectiveNote.Chest}}

+

CVS : {{objectiveNote.CVS}}

+

Abdomen : {{objectiveNote.Abdomen}}

+

Extremity : {{objectiveNote.Extremity}}

+

Skin : {{objectiveNote.Skin}}

+

Neurological : {{objectiveNote.Neurological}}

+
+
+
+
+
+

Lab and Orders

+
+
+
+
+
+ {{odr.ItemName}}({{odr.Type}}) ,  +
+
+
+ +
+
+
+
+
+
+
+

Assessment and Orders

+
+ +
+

No Assessment Plan and Orders yet

+ + + + + + + + + + + + +
Assessment NameOrders
+ ({{assessment.ICD[0].ICD10Code}}) {{assessment.ICD[0].ICD10Description}} + +

Lab:

+ + +

Imaging:

+ + +

Medication:

+ + +
+
+ +
+
+ +
+

Instructions:

+

Follow Up:{{hpNote?.FollowUp}} {{hpNote?.FollowUpUnit}}

+

Remarks:{{hpNote?.Remarks}}

+
+
+ diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/assessment-plan/assessment-plan.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/assessment-plan/assessment-plan.html index 7838d73c..423d3453 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/assessment-plan/assessment-plan.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/assessment-plan/assessment-plan.html @@ -47,7 +47,8 @@

Assessment/Plan

-
+ +
= null; + public secondaryNavItems: Array = null; + constructor(public securityService: SecurityService, public visitService: VisitService, public coreService: CoreService) { + //get the chld routes of Clinical from valid routes available for this user. + this.validRoutes = this.securityService.GetChildRoutes("Doctors/PatientOverviewMain/NotesSummary"); + this.primaryNavItems = this.validRoutes.filter(a => a.IsSecondaryNavInDropdown == null || a.IsSecondaryNavInDropdown == 0); + this.secondaryNavItems = this.validRoutes.filter(a => a.IsSecondaryNavInDropdown == 1); } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes-routing.constant.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes-routing.constant.ts index b0fa2ed1..46955b89 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes-routing.constant.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes-routing.constant.ts @@ -3,10 +3,12 @@ import { RouterModule } from '@angular/router'; import { NotesListComponent } from './notes-list/notes-list.component'; import { FreeNotesComponent } from './freenotes/freenotes.component'; import { PageNotFound } from '../404-error/404-not-found.component'; +import { OPDExaminationComponent } from './OPDExamination/OPD-Examination.component'; export const NotesRoutingConstant = [ - { path: '', redirectTo: 'NotesList', pathMatch: 'full' }, + { path: '', redirectTo: 'OPDExamination', pathMatch: 'full' }, { path: 'NotesList', component: NotesListComponent }, { path: 'FreeNotes', component: FreeNotesComponent }, + {path:'OPDExamination',component: OPDExaminationComponent}, { path: "**", component: PageNotFound } ]; diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts index 534fc4bd..8bad6800 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/notes.module.ts @@ -29,12 +29,15 @@ import { ViewEmergencyNoteComponent } from './templates/emergency-note/view-emer import { ClinicalPrescriptionNoteComponent } from './prescription-note/clinical-prescription-note.component'; import { ViewClinicalPrescriptionNoteComponent } from './prescription-note/view-clinical-prescription-note.component'; import { OPDExaminationComponent } from './OPDExamination/OPD-Examination.component'; +import { MedicationBLService } from '../clinical/shared/medication.bl.service'; +import { OpdexaminationViewComponent } from './OPDExamination/opd-examination-view.component'; @NgModule({ providers: [ - NoteTemplateBLService + NoteTemplateBLService, + MedicationBLService, ], imports: [ CommonModule, @@ -67,7 +70,8 @@ import { OPDExaminationComponent } from './OPDExamination/OPD-Examination.compon ViewEmergencyNoteComponent, ClinicalPrescriptionNoteComponent, ViewClinicalPrescriptionNoteComponent, - OPDExaminationComponent + OPDExaminationComponent, + OpdexaminationViewComponent ] }) diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.component.ts index 5c910efe..4fdb5a99 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.component.ts @@ -9,6 +9,7 @@ import { Vitals } from "../../clinical/shared/vitals.model"; import { PatientClinicalDetail } from "../../clinical/shared/patient-clinical-details.vmodel"; import { NotesModel } from "../shared/notes.model"; import { Visit } from "../../appointments/shared/visit.model"; +import { MedicationBLService } from "../../clinical/shared/medication.bl.service"; @Component({ selector: "objective-note", @@ -23,6 +24,7 @@ export class ObjectiveNotesComponent { public vitalsList: Array = new Array(); public painDataList: Array = new Array(); public addVitalBox: boolean = false; + public showMedicationAddBox: boolean = false; //@input-medication @Input("objective-note") public objectiveNote: ObjectiveNotesModel; @@ -34,7 +36,8 @@ export class ObjectiveNotesComponent { constructor(public ioAllergyVitalsBLService: IOAllergyVitalsBLService, public patientservice: PatientService, public visitService: VisitService , public securityService: SecurityService, - public changeDetector: ChangeDetectorRef, public msgBoxServ: MessageboxService) + public changeDetector: ChangeDetectorRef, public msgBoxServ: MessageboxService, + public medicationBLService: MedicationBLService,) { this.patVisit = this.visitService.getGlobal(); this.GetPatientVitalsList(); @@ -127,6 +130,20 @@ export class ObjectiveNotesComponent { this.CallBackObjectiveNotes.emit({ objectivenote : this.objectiveNote }); } } + CallBackAddMedication($event) { //@output + if ($event && $event.homeMedication) { + this.clinicalDetail.Medications.push($event.homeMedication); + } + this.showMedicationAddBox = false; + this.changeDetector.detectChanges(); +} + + +AddMediactionPopUp() { + this.showMedicationAddBox = false; + this.changeDetector.detectChanges(); + this.showMedicationAddBox = true; +} } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.html index 7d4fae16..c0e972fb 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/objective/objective-note.html @@ -15,7 +15,7 @@

Clinical Objective Notes

- +
@@ -24,7 +24,7 @@

Clinical Objective Notes

- +
@@ -33,7 +33,7 @@

Clinical Objective Notes

- +
@@ -42,7 +42,7 @@

Clinical Objective Notes

- +
@@ -51,7 +51,7 @@

Clinical Objective Notes

- +
@@ -60,7 +60,7 @@

Clinical Objective Notes

- +
@@ -69,7 +69,7 @@

Clinical Objective Notes

- +
@@ -166,7 +166,58 @@

- + + Nadi + {{vitals.Nadi}} + + + Mala + {{vitals.Mala}} + + + Mutra + {{vitals.Mutra}} + + + Jivha + {{vitals.Jivha}} + + + Shabda + {{vitals.Shabda}} + + + Sparsha + {{vitals.Sparsha}} + + + Drik + {{vitals.Drik}} + + + Akriti + {{vitals.Akriti}} + + + Lung Field + {{vitals.LungField}} + + + Heart Sounds + {{vitals.HeartSounds}} + + + PA_Tenderness + {{vitals.PA_Tenderness}} + + + Organomegaly + {{vitals.Organomegaly}} + + + CNS_Consiousness + {{vitals.CNS_Consiousness}} + @@ -182,9 +233,60 @@

- +
+
+
+
+

+ Medication + [{{clinicalDetail.Medications.length}}] + +

+
+

No records found

+ + + + + + + + + + + + + + + + + + + + + + +
Medication NameTypeDoseRouteLast TakenFrequencyCommentsChange
{{add.MedicationName}}{{add.MedicationType | uppercase}}{{add.Dose}}{{add.Route}}{{add.LastTaken | DanpheDateTime:'format':'YYYY-MM-DD'}}{{add.Frequency}}{{add.Comments}}
+
+ +
+
+
+
+
+
+
+ +
+
+
+
diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts deleted file mode 100644 index 5e32d0a7..00000000 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/OPD-Examination.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -export class OPDExaminationModel { - public PatientId: number = 0; - public PatientVisitId: number = 0; - public CreatedBy: number = null; - public CreatedOn: string = null; - public ModifiedBy: number = null; - public ModifiedOn: string = null; - public IsActive: boolean = true; -} \ No newline at end of file diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/note-template.bl.service.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/note-template.bl.service.ts index fa58ecd5..a9a5505e 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/note-template.bl.service.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/shared/note-template.bl.service.ts @@ -59,6 +59,13 @@ export class NoteTemplateBLService { return this.clinicalDLService.PostHistoryAndPhysicalNoteTemplate(temp) .map(res => res); } + public PostOpdExamination(NoteMaster: NotesModel) { + var temp = _.omit(NoteMaster, ['DischargeSummaryNote', 'EmergencyNote', 'ProgressiveNote']); + var newtemp = _.omit(temp.SubjectiveNote, ['SubjectiveNoteValidator']); + temp.SubjectiveNote = newtemp; + return this.clinicalDLService.PostOpdExamination(temp) + .map(res => res); + } public PostEmergencyNoteTemplate(NoteMaster: NotesModel) { var temp = _.omit(NoteMaster, ['DischargeSummaryNote', 'FreeTextNote', 'ProcedureNote', 'ProgressiveNote', 'ClinicalDiagnosis']); @@ -110,6 +117,10 @@ export class NoteTemplateBLService { return this.clinicalDLService.GetHistoryAndPhysicalNoteById(NotesId) .map(res => res); } + public GetOpdExaminationdetailsById(patientId,PatientVisitid) { + return this.clinicalDLService.GetOpdExaminationdetailsById(patientId,PatientVisitid) + .map(res => res); + } public GetEmergencyNoteById(NotesId) { return this.clinicalDLService.GetEmergencyNoteById(NotesId) .map(res => res); diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.component.ts b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.component.ts index 1c1d240a..04d54f28 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.component.ts +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.component.ts @@ -4,7 +4,18 @@ import { PatientClinicalDetail } from "../../clinical/shared/patient-clinical-de import { NotesModel } from '../shared/notes.model'; import { Visit } from '../../appointments/shared/visit.model'; import { VisitService } from '../../appointments/shared/visit.service'; +import { DanpheHTTPResponse } from '../../shared/common-models'; +import { MessageboxService } from '../../shared/messagebox/messagebox.service'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { ICD10 } from '../../clinical/shared/icd10.model'; +import { OrderItemsVM } from '../../orders/shared/orders-vms'; +import { DanpheCache } from '../../shared/danphe-cache-service-utility/cache-services'; +import { MasterType } from '../../shared/danphe-cache-service-utility/cache-services'; +import { CommonFunctions } from '../../shared/common.functions'; +import { ClinicalPrescriptionNotesModel } from '../shared/clinical-prescription-note.model'; +import { OrderService } from '../../orders/shared/order.service'; +import { Router } from '@angular/router'; @Component({ selector: 'subjective-note', @@ -16,7 +27,18 @@ export class SubjectiveNoteComponent { public notes: NotesModel = new NotesModel(); public subjectiveNote: SubjectiveNotesModel = new SubjectiveNotesModel; - + public allOrdItems: Array = []; + public ordItemsFiltered: Array = []; + public itemsType: Array = []; + public selItemType: string = "All"; + public selOrdItem: any = null; + public ICD10List = []; + public icd10Selected: ICD10 = null; + + public update: boolean = false; + public options = { + headers: new HttpHeaders({ 'Content-Type': 'application/x-www-form-urlencoded' }) + }; @Input("clinical-detail") public clinicalDetail: PatientClinicalDetail = new PatientClinicalDetail(); @@ -27,18 +49,66 @@ export class SubjectiveNoteComponent { public set SubNote(data) { this.subjectiveNote = data; } - + @Input("patientVisitId") + public patientVisitId: number; + @Input("notesId") + public notesId: number; + + @Input("prescriptionNote") + public prescriptionNotes: ClinicalPrescriptionNotesModel = new ClinicalPrescriptionNotesModel(); + public showAllergyAddBox: boolean = false; //@input-allergy public addPastProblemBox: boolean = false; //@input Past public showSurgicalAddBox: boolean = false; //@input surgery public showSocialAddBox: boolean = false; //@input social public showFamilyHistoryBox: boolean = false; ///@input family - + public empAllPreferences: Array = null; + public selOrdItems: Array = []; + public empPreferenceGroups: Array = []; + public SelectedOrderItems: Array = []; constructor(public changeDetector: ChangeDetectorRef, - public visitService: VisitService) { + public visitService: VisitService, + public msgBoxServ: MessageboxService, public http: HttpClient,public ordServ: OrderService, + public router: Router,) { this.patVisit = this.visitService.getGlobal(); + this.LoadAllOrderItems(); + this.GetICDList(); } - + ngOnInit() { + if (this.notesId) { + this.update = true; + + if (this.prescriptionNotes && this.prescriptionNotes.ICDSelected && this.prescriptionNotes.ICDSelected.trim().length) { + this.prescriptionNotes.ICDList = JSON.parse(this.prescriptionNotes.ICDSelected); + } else { + this.AddNewICDRow(); + } + + if (this.prescriptionNotes && this.prescriptionNotes.OrdersSelected && this.prescriptionNotes.OrdersSelected.trim().length) { + this.prescriptionNotes.SelectedOrderItems = JSON.parse(this.prescriptionNotes.OrdersSelected); + } + + } else { + this.AddNewICDRow(); + this.update = false + } + } + + public AddNewICDRow() { + let newicd: ICD10 = Object.assign({},new ICD10()); + newicd.ICD10Description = ''; + this.prescriptionNotes.ICDList.push(newicd); + + let new_index = this.prescriptionNotes.ICDList.length - 1; + if (new_index > 0) { + window.setTimeout(function () { + let itmNameBox = document.getElementById('icd10-box' + new_index); + if (itmNameBox) { + itmNameBox.focus(); + } + }, 500); + } + } //-------------------Add Allergy------------------ AddAllergyPopUp() { this.showAllergyAddBox = false; @@ -123,4 +193,133 @@ export class SubjectiveNoteComponent { this.CallBackSubjectiveNotes.emit({ subjectivenote: this.subjectiveNote }); } } + public GetICDList() { + this.ICD10List = DanpheCache.GetData(MasterType.ICD, null); + } + LoadAllOrderItems() { + this.http.get('/api/Orders?reqType=allOrderItems', this.options).map(res => res) + .subscribe((res: DanpheHTTPResponse) => { + if (res.Status == "OK") { + this.allOrdItems = res.Results.filter(d => d.PreferenceType.toLowerCase() != 'medication'); + + this.allOrdItems.forEach(itm => { + itm.IsSelected = false; + itm.FormattedName = itm.Type + "-" + itm.ItemName; + }); + + this.GenerateItemTypes(); + } + else { + this.msgBoxServ.showMessage("failed", ['Failed. please check log for details.'], res.ErrorMessage); + } + }); + } + GenerateItemTypes() { + let allItmsType = this.allOrdItems.map(itm => { + return itm.PreferenceType; + }); + this.itemsType = CommonFunctions.GetUniqueItemsFromArray(allItmsType); + this.itemsType.unshift("All");//add default itemstype to the beginning of array. + + this.ordItemsFiltered = Object.assign([], this.allOrdItems); + } + ItemsTypeOnChange() { + if (this.selItemType && (this.selItemType != "All")) { + this.ordItemsFiltered = this.allOrdItems.filter(itm => itm.PreferenceType.toLowerCase() == this.selItemType.toLowerCase()); + } + else { + this.ordItemsFiltered = Object.assign([], this.allOrdItems); + } + } + OrderItemValueChanged() { + if (this.selOrdItem && this.selOrdItem.ItemId) { + let oditem = Object.assign({}, this.selOrdItem); + this.AddNewItemToOrders(oditem); + } + this.changeDetector.detectChanges(); + this.selOrdItem = ''; + } + AddNewItemToOrders(item) { + item.IsSelected = true; + let alreadyExists = this.prescriptionNotes.SelectedOrderItems.filter(itm => itm.Type == item.Type && itm.ItemId == item.ItemId).length; + if (!alreadyExists) { + this.prescriptionNotes.SelectedOrderItems.unshift(item); + } + } + RemoveOrderItem(item) { + item.IsSelected = false; + let itmIndex = this.prescriptionNotes.SelectedOrderItems.findIndex(itm => itm.Type == item.Type && itm.ItemId == item.ItemId); + this.prescriptionNotes.SelectedOrderItems.splice(itmIndex, 1); + } + orderItemsListFormatter(data: any): string { + let isGeneric = data["IsGeneric"]; + let retHtml = ""; + + + if (!isGeneric) { + let dosage = data["Dosage"]; + let freq = data["FreqInWords"]; + + + retHtml = data["ItemName"] + "|" + data["GenericName"] + "|" + (dosage != null && dosage != "" ? dosage : "Dose:NA") + "|" + (freq != null && freq != "" ? freq : "Frequency:NA" + " | Available Quantity: " + data["AvailableQuantity"]); + // retHtml = "(" + data["Type"] + ")" + "" + data["ItemName"] + ""; + } + else { + retHtml = "(" + data["Type"] + ")" + data["ItemName"] + " | Available Quantity: " + data["AvailableQuantity"]; + } + + return retHtml; + } + ICDListFormatter(data: any): string { + let html; + //if the ICD is not valid for coding then it will be displayed as bold. + //needs to disable the field that are not valid for coding as well. + if (!data.ValidForCoding) { + html = "" + data["ICD10Code"] + " " + data["ICD10Description"] + ""; + } + else { + html = data["ICD10Code"] + " " + data["ICD10Description"]; + } + return html; + } + public DeleteRow(ind: number) { + this.prescriptionNotes.ICDList.splice(ind, 1); + } + CancelAll() { + this.SelectedOrderItems.forEach(itm => { + itm.IsSelected = false; + }); + + if (this.empAllPreferences) { + this.empAllPreferences.forEach(itm => { + itm.IsSelected = false; + }); + this.CreatePreferenceGroups(); + } + + this.SelectedOrderItems = []; + + } + CreatePreferenceGroups() { + + if (this.empAllPreferences && this.empAllPreferences.length > 0) { + this.empPreferenceGroups = []; + let allTypes = this.empAllPreferences.map(itm => { + return itm.PreferenceType; + }); + let distTypes = CommonFunctions.GetUniqueItemsFromArray(allTypes); + + if (distTypes && distTypes.length > 0) { + distTypes.forEach(grp => { + this.empPreferenceGroups.push({ GroupName: grp, Items: this.empAllPreferences.filter(itm => itm.PreferenceType == grp) }); + }); + + } + } + } + + ProceedAll() { + this.ordServ.allNewOrderItems = this.SelectedOrderItems; + this.router.navigate(['/Doctors/PatientOverviewMain/Orders/OrderRequisition']); + } } diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.html index bebc540a..3aab6bd7 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/subjective/subjective-note.html @@ -26,7 +26,7 @@

Clinical Subjective Notes

- +
@@ -34,14 +34,14 @@

Clinical Subjective Notes

- +
- +
@@ -274,72 +274,73 @@

+ --> + + +
+

No records found

+ + + + + + + + + + + + + + + +
ICD10 DescriptionOn Set DateResolved DateNotes
{{pastMedical.ICD10Description}}{{pastMedical.OnSetDate | DanpheDateTime:'format':'YYYY-MM-DD'}}{{pastMedical.ResolvedDate | DanpheDateTime:'format':'YYYY-MM-DD'}}{{pastMedical.Note}}
+
+ --> + - - + +
diff --git a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/templates/freetext/freetext.html b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/templates/freetext/freetext.html index a68ddf80..5827891b 100644 --- a/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/templates/freetext/freetext.html +++ b/Code/Websites/DanpheEMR/wwwroot/DanpheApp/src/app/clinical-notes/templates/freetext/freetext.html @@ -23,17 +23,17 @@
-

Free Text Note

+

Free Text Note

- +
-
+
-
+

{{CurrentHomeMedication.HomeMedicationId ? 'Update' : 'Add'}} Home Medication

@@ -110,7 +110,7 @@

{{CurrentHomeMedication.HomeMedicationId ? 'Update'

- +