Skip to content

Commit

Permalink
1-Login page (done changes now static)
Browse files Browse the repository at this point in the history 
-Image Logo
-Danphe name with version number
-left side panel with hospital name
-copyright message at left side panel bottom side
2-Logo changes
3-Printer setting from core parameter (updated from sql script)
4-updated all required core parameter values as per client excel info, create separate db script and run
5-fixed opd examination list, view and routing issue
6-fixed production build errors for clinical module
7-db script changes for table creation and core parameter add/update
  • Loading branch information
NageshBB committed Mar 4, 2022
1 parent f04fbb6 commit 473a854
Show file tree
Hide file tree
Showing 17 changed files with 182 additions and 87 deletions.
16 changes: 2 additions & 14 deletions Code/Websites/DanpheEMR/Controllers/Clinical/ClinicalController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,18 +1011,6 @@ join item in dbContext.PHRMItemMaster on pres.ItemId equals item.ItemId
}
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()
Expand All @@ -1043,7 +1031,7 @@ 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
where note.NotesId == notesId
select new
{
note.PatientId,
Expand All @@ -1064,7 +1052,7 @@ from pre in tempPre.ToList()
ObjectiveNote = objNote,
Prescription = pre,
DiagnosisOrdersList = (from allDiagnosis in dbContext.ClinicalDiagnosis
where allDiagnosis.NotesId == NotesId && allDiagnosis.IsActive == true
where allDiagnosis.NotesId == notesId && allDiagnosis.IsActive == true
select new
{
allDiagnosis.DiagnosisId,
Expand Down
24 changes: 16 additions & 8 deletions Code/Websites/DanpheEMR/Views/Account/Login.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
}
.l-c {
margin-top: 15%;
margin-top: 3%;
}
.feature li {
Expand Down Expand Up @@ -238,6 +238,9 @@
float: left;
margin-top: 1px;
}
.form-group {
margin-bottom: 0px !important;
}
</style>


Expand All @@ -256,7 +259,8 @@
<div class="col-md-4">
<div class="left-img" style=" background-image: url('/themes/theme-default/images/login-left.jpg'); position: relative;">
<div class="">
<h1>Danphe Emr</h1>
@*<h1>Danphe Emr</h1>*@ @*NextChanges:get product name from appsettings and show here*@
<h1>Healthcare Emr</h1>
<p>A Complete <b style="color: #00ffa1; font-weight: 600 ">Healthcare Management Solution</b> for Hospitals, Clinics and Pharmacy.</p>
<ul class="feature">
<li><span>&#9745;</span>EMR</li>
Expand All @@ -267,12 +271,13 @@
<li><span>&#9745;</span>Patient Portal</li>
</ul>
@*<div style="margin-top: 20px;">
Our &nbsp;<a class="text-right termscondition" href="#" original-title="terms and conditions">Terms & Condition</a>&nbsp;
</div>*@
Our &nbsp;<a class="text-right termscondition" href="#" original-title="terms and conditions">Terms & Condition</a>&nbsp;
</div>*@
</div>
<p class="text-center footer-btm-cprt">
<a class="text-right termscondition" href="#" original-title="terms and conditions">Terms & Condition</a><br />
&copy; Copyright 2020 <a href="http://www.danphehealth.com/" target="_blank" title="DanpheHealth Pvt. Ltd.">Danphe Health</a>
&copy; Copyright 2020 @*<a href="http://www.danphehealth.com/" target="_blank" title="DanpheHealth Pvt. Ltd.">Danphe Health</a>*@ @*NextChanges: get website and company name from appsettings file*@
<a href="#" target="_blank" title="">Healthcare EMR</a>
</p>
@*<div style="position: absolute; left: 0; bottom: 30px; font-size: 12px;">
<span>
Expand Down Expand Up @@ -310,10 +315,10 @@
<div class="form-horizontal">

<div class="form-group text-center">
<img src="~/themes/theme-default/images/danphe-logo.png" alt="Alternate Text" />
<img style="width:60%; margin-top:10px !important;" src="~/themes/theme-default/images/danphe-logo.png" alt="Alternate Text" />
</div>

<div class="form-group" style="margin-top: 40px;">
<div class="form-group" >
<div class="text-center">
<h1><small class="balck">Sign in</small></h1>
</div>
Expand Down Expand Up @@ -393,7 +398,10 @@

<div class="form-group">
<div class="col-sm-12">
<div class="text-center"><span class="txt-xs" style="font-weight: 600;line-height: 5;">Danphe EMR Version 1.0</span> </div>
<div class="text-center">
@*<span class="txt-xs" style="font-weight: 600;line-height: 5;">Danphe EMR Version 1.0</span>*@@*NextChanges:get product name and version number from appsettings and show here*@
<span class="txt-xs" style="font-weight: 600;line-height: 5;">Healthcare EMR Version 1.0.1</span>
</div>
</div>
</div>

Expand Down
55 changes: 29 additions & 26 deletions ...MR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@
}
</style>
<div>
<div class="col-md-12" style="margin-bottom: 3px;">
<a feature="button" class="btn blue bordered" (click)="RouteToNotesList()"><i class=""></i>Cancel</a>
</div>
<!-- Subjective Notes related fields for Emergency Note-->
<div >
<div class="col-md-12" >

<subjective-note [subjective-note]="notes.SubjectiveNote"
[clinical-detail]="clinicalDetail" (callback-subjectivenote)="CallBackSubjective($event)"></subjective-note>
</div>
Expand Down Expand Up @@ -197,35 +201,34 @@ <h3>Lab and Orders</h3>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Objective Notes fields-->
<div class="tab-pane" id="objective">
<objective-note [objective-note]="notes.ObjectiveNote"
[clinical-detail]="clinicalDetail" (callback-objectivenote)="CallBackObjective($event)"></objective-note>
</div>
<div class="col-md-12">
<div class="tab-pane col-md-6">
<freetext [patDetail]="patVisit"
[editFreeText]="notes.FreeTextNote"
(callback-freetextnotes)="CallBackFreeTexts($event)"> </freetext>
</div>
<!-- ER-Course -->
<form class="hm-form">
</form>


<!-- Assessment-Plan -->
<div class="tab-pane col-md-6" id="assessment">
<!-- <div class="col-md-12" id="assessment">
<assessment-plan [editMode]="APeditMode"
[assessments]="assessment"
(callback-assessmentandplan)="CallBackAssesmentAndPlan($event)">
</assessment-plan>
</div>
<procedure-notes [editProcedureNote]="procedureNote"
[patDetail]="patDetail"
</div> -->
<div class="col-md-12" >
<freetext [patDetail]="patVisit"
[editFreeText]="notes.FreeTextNote"
(callback-freetextnotes)="CallBackFreeTexts($event)"> </freetext>
</div>
<div class="col-md-12">
<procedure-notes [editProcedureNote]="notes.ProcedureNote"
[patDetail]="patVisit"
(callback-procedurenotes)="CallBackProcedureNotes($event)">
</procedure-notes>
</procedure-notes>
</div>

<!-- Start: Instructions related fields for Emergency Note-->
Expand Down Expand Up @@ -286,19 +289,19 @@ <h3 class="text-head cstm-add-heading">Instructions</h3>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<!-- <div class="col-md-3">
<button class="btn blue"> Start (Sign) </button>
</div>
<div class="col-md-3">
</div> -->
<!-- <div class="col-md-3">
<button class="btn btn-success" (click)="SubmitTemplate(1)"> Submit </button>
</div>
<div class="col-md-3">
</div> -->
<div class="col-md-1">
<button class="btn btn-primary" (click)="SubmitTemplate(0)"> Save </button>
</div>
<div class="col-md-3">
<button class="btn blue" (click)="print($event)"> <i class="glyphicon glyphicon-print"></i> Print </button>
<!-- <div class="col-md-2">
<button class="btn blue" (click)="print($event)"> <i class="glyphicon glyphicon-print"></i> View & Print</button>
</div>
</div> -->
</div>
</div>
<div *ngIf="showView" class="popup-static portlet box portlet-fullscreen" style="margin-bottom:25px">
Expand All @@ -310,7 +313,7 @@ <h3 class="text-head cstm-add-heading">Instructions</h3>
<div style="padding:10px"> <i class="btn btn-danger pull-right" style="margin-top:10px; margin-right:-10px;" (click)="Close()">X</i> </div>
<div class="panel panel-default">
<div id="print-template" class="row printStyle print-border">
<div class="panel-heading"> OPD Examination </div>
<!-- <div class="panel-heading"> OPD Examination </div> -->
<opd-examination-view [patientVisitId]="patientVisitId"
(callback-view)="CallBackView($event)"> </opd-examination-view>
</div>
Expand Down
25 changes: 16 additions & 9 deletions ...eEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/OPD-Examination.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ 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";
import { Router } from "@angular/router";

@Component({
selector: "OPD-Examination",
Expand Down Expand Up @@ -87,7 +88,7 @@ export class OPDExaminationComponent{
public notetemplateBLService: NoteTemplateBLService,
public patientService: PatientService,
public changeDetector: ChangeDetectorRef,
public ordServ: OrderService,
public ordServ: OrderService, public router: Router,
public securityService: SecurityService,
public http: HttpClient) {
this.pat = this.patientService.globalPatient;
Expand Down Expand Up @@ -281,11 +282,12 @@ SubmitTemplate(value) {
}
}
PostTemplate() {
if (this.visitService.globalVisit.ConcludeDate) {
this.isVisitConcluded = true;
this.msgBoxServ.showMessage("Warning", ["This Visit is concluded"]);
} else {
this.isVisitConcluded = false;
// 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;
Expand All @@ -297,6 +299,7 @@ PostTemplate() {
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.TemplateName=this.templateList.find(temp=>temp.TemplateName == this.NoteType).TemplateName;
this.notes.NoteTypeId = this.noteTypeList.find(type => type.NoteType == this.NoteType).NoteTypeId;
//Logic for Posting History and Physical Note

Expand All @@ -314,7 +317,7 @@ PostTemplate() {
this.msgBoxServ.showMessage("Warning", ["Submit can't be done with all fields empty !"]);
}
}
}

}
MapAllOrdersAndAssign() {

Expand Down Expand Up @@ -561,15 +564,19 @@ MapAllOrdersAndAssign() {
.subscribe(res => {
if (res.Status == "OK") {
this.msgBoxServ.showMessage("Success", ["OPD Examination done successfully."]);
// this.RouteToViewNotes();
this.RouteToNotesList();
}
else {
this.msgBoxServ.showMessage("Failed", ["Error in Posting OPD Examination"]);
console.log(res.ErrorMessage);
}
});
}

public RouteToNotesList(){
this.router.navigate([
"/Doctors/PatientOverviewMain/NotesSummary/NotesList",
]);
}
public GetNoteTypeList() {
try {

Expand Down
7 changes: 5 additions & 2 deletions ...wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ export class OpdexaminationViewComponent {
public headerDetail: { header1, header2, header3, header4, hospitalName; address; email; PANno; tel; DDA };
public pat :number=0;
public patVisit:number=0;

public patientQRCodeInfo:string="";
public notesId:number=0;
@Input("patientVisitId")
public patientVisitId: number;

@Output("callback-view")
public CallBackView: EventEmitter<Object> = new EventEmitter<Object>();
constructor(public noteTemplateBLService: NoteTemplateBLService,
Expand All @@ -38,13 +40,14 @@ export class OpdexaminationViewComponent {
public visitService:VisitService) {
this.pat = this.patientService.getGlobal().PatientId;
this.patVisit = this.visitService.getGlobal().PatientVisitId;
this.notesId= this.noteTemplateBLService.NotesId;
this.GetHeaderParameter();
this.getOpdExaminationData()

}
getOpdExaminationData(){
//if ( > 0) {
this.noteTemplateBLService.GetOpdExaminationdetailsById(this.pat,this.patVisit).
this.noteTemplateBLService.GetOpdExaminationdetailsById(this.pat,this.patVisit,this.notesId).
subscribe((res) => {

if (res.Status == "OK" && res.Results) {
Expand Down
19 changes: 10 additions & 9 deletions ...npheEMR/wwwroot/DanpheApp/src/app/clinical-notes/OPDExamination/opd-examination-view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ <h4><strong>Subjective Notes</strong></h4>
<div class="col-md-4">
<h4><strong>Clinical Notes</strong></h4>
</div>
<div class="col-md-8" *ngIf="note && note.Prescription">
{{note.Prescription.PrescriptionNoteText}}
<div class="col-md-8" *ngIf="Prescription">
{{Prescription.PrescriptionNoteText}}
</div>
</div>
<div class="row form-group">
Expand Down Expand Up @@ -110,7 +110,7 @@ <h4><strong>Lab and Orders</strong></h4>
</div>
</div>
</div>
<div class="col-md-12">
<!-- <div class="col-md-12">
<div class="prob-entry hm-form">
<div class="text-head-wrapper clearfix">
<h4><strong>Assessment and Orders</strong></h4>
Expand All @@ -128,20 +128,21 @@ <h4><strong>Assessment and Orders</strong></h4>
<tr *ngFor="let assessment of diagnosisOrderList; let assessIndex=index;">
<td width="38%">
({{assessment.ICD[0].ICD10Code}}) {{assessment.ICD[0].ICD10Description}}
</td>
<p *ngIf="assessment && assessment.ICD"> ({{assessment.ICD[0].ICD10Code}}) {{assessment.ICD[0].ICD10Description}}
</p>
</td>
<td>
<p *ngIf="assessment.AllIcdLabOrders.length>0" style="font-weight:700!important;">Lab: </p>
<p *ngIf="assessment && assessment.AllIcdLabOrders && assessment.AllIcdLabOrders.length>0" style="font-weight:700!important;">Lab: </p>
<label *ngFor="let lo of assessment.AllIcdLabOrders">
{{lo.ItemName}}
</label>
<p *ngIf="assessment.AllIcdImagingOrders.length>0" style="font-weight:700!important;">Imaging: </p>
<p *ngIf="assessment && assessment.AllIcdImagingOrders && assessment.AllIcdImagingOrders.length>0" style="font-weight:700!important;">Imaging: </p>
<label *ngFor="let io of assessment.AllIcdImagingOrders">
{{io.ItemName}}
</label>
<p *ngIf="assessment.AllIcdPrescriptionOrders.length>0" style="font-weight:700!important;">Medication: </p>
<p *ngIf="assessment && assessment.AllIcdPrescriptionOrders && assessment.AllIcdPrescriptionOrders.length>0" style="font-weight:700!important;">Medication: </p>
<label *ngFor="let mo of assessment.AllIcdPrescriptionOrders">
{{mo.ItemName}}
</label>
Expand All @@ -152,7 +153,7 @@ <h4><strong>Assessment and Orders</strong></h4>
</div>
</div>
</div>
</div> -->

<div class="col-md-12" style="margin-left:15px;">
<h4><strong>Instructions:</strong></h4>
Expand Down
Loading

0 comments on commit 473a854

Please sign in to comment.