- |
- |
{{ i + 1 }}. |
>> .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label {
+.tabs_css ::ng-deep .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label {
color:unset !important;
}
-.tabs_css >>> .mat-mdc-tab-labels {
+.tabs_css ::ng-deep .mat-mdc-tab-labels {
width: 25rem !important;
}
-.tabs_css >>> .mat-mdc-tab {
+.tabs_css ::ng-deep .mat-mdc-tab {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@@ -251,13 +251,12 @@ md-expansion-panel {
font-weight: var(--mat-tab-header-label-text-weight);
}
-.tabs_css >>> .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus {
+.tabs_css ::ng-deep .mat-tab-group.mat-primary .mat-tab-label:focus, .mat-tab-group.mat-primary .mat-tab-link:focus, .mat-tab-nav-bar.mat-primary .mat-tab-label:focus, .mat-tab-nav-bar.mat-primary .mat-tab-link:focus {
background-color: rgba(179, 229, 252, 0.3);
}
.mat_form_field {
- margin-left: -15px;
+ margin-left: 13px;
margin-top: 40px;
- min-width: 108%;
-
-}
\ No newline at end of file
+ min-width: 100%;
+}
diff --git a/src/app/app-modules/lab/workarea/workarea.component.html b/src/app/app-modules/lab/workarea/workarea.component.html
index c23df06..7811bd9 100644
--- a/src/app/app-modules/lab/workarea/workarea.component.html
+++ b/src/app/app-modules/lab/workarea/workarea.component.html
@@ -43,7 +43,7 @@ {{ procedure.value.procedureName }}
matTooltip="{{ current_language_set?.startTest }}"
md-button
type="button"
- class="button-style"
+ class="mat_blue"
style="margin-right: 15px"
*ngIf="
procedure?.value?.procedureStartAPI !== undefined
@@ -99,6 +99,7 @@ {{ procedure.value.procedureName }}
- {{ option.ecgAbnormality }}
-
-
+
+ {{ option.ecgAbnormality }}
+
+
+
@@ -277,43 +289,59 @@ {{ procedure.value.procedureName }}
"
>
-
- {{ options.value.name }}
-
-
+ >
+ {{ options.value.name }}
+
+
+
-
+
{
if (result) {
- this.labService.viewFileContent(result).subscribe((res: any) => {
- const blob = new Blob([res], { type: res.type });
- console.log(blob, 'blob');
- const url = window.URL.createObjectURL(blob);
- const a = document.createElement('a');
- a.href = url;
- a.download = result.fileName;
- document.body.appendChild(a);
- a.click();
- document.body.removeChild(a);
+ const fileID = {
+ fileID: result,
+ };
+ this.labService.viewFileContent(fileID).subscribe((res: any) => {
+ if (res && res.data && res.data.statusCode === 200) {
+ const fileContent = res.data.data?.response;
+ location.href = fileContent;
+ }
});
}
});
diff --git a/src/app/app-modules/lab/worklist/worklist.component.css b/src/app/app-modules/lab/worklist/worklist.component.css
index 18dbd21..8f175aa 100644
--- a/src/app/app-modules/lab/worklist/worklist.component.css
+++ b/src/app/app-modules/lab/worklist/worklist.component.css
@@ -19,7 +19,7 @@ mat-input-container {
}
mat-card {
- min-height: 400px;
+ /* min-height: 400px; */
/* padding: 15px; */
}
@@ -30,4 +30,13 @@ mat-card {
#caseSheetButton {
width: 100%;
}
+}
+@media screen and (min-width:360px) and (max-width:430px) {
+ .fit_to_content{
+ width: fit-content !important;
+
+ }
+ .mat_blue{
+ margin-top: 2px;
+ }
}
\ No newline at end of file
diff --git a/src/app/app-modules/lab/worklist/worklist.component.html b/src/app/app-modules/lab/worklist/worklist.component.html
index 1a42f71..a69c4f0 100644
--- a/src/app/app-modules/lab/worklist/worklist.component.html
+++ b/src/app/app-modules/lab/worklist/worklist.component.html
@@ -1,6 +1,6 @@
-
+
-
+
-
diff --git a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
index c78229d..44b2ec7 100644
--- a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts
@@ -27,6 +27,7 @@ import { ConfirmationService } from 'src/app/app-modules/core/services';
import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
import { RegistrarService } from 'src/app/app-modules/registrar/shared/services/registrar.service';
import { NurseService, MasterdataService } from '../../../shared/services';
+import * as moment from 'moment';
@Component({
selector: 'app-doctor-diagnosis-case-sheet',
@@ -94,6 +95,10 @@ export class DoctorDiagnosisCaseSheetComponent
cough_pattern: any;
cough_severity_score: any;
record_duration: any;
+ referDetails: any;
+ serviceList = '';
+ referralReasonList = '';
+ isCovidVaccinationStatusVisible = false;
constructor(
private doctorService: DoctorService,
@@ -320,6 +325,49 @@ export class DoctorDiagnosisCaseSheetComponent
);
}
}
+
+ if (
+ this.visitCategory === 'General OPD (QC)' &&
+ this.casesheetData &&
+ this.casesheetData.doctorData
+ ) {
+ this.referDetails = this.casesheetData.doctorData.Refer;
+ if (this.referDetails?.refrredToAdditionalServiceList) {
+ this.serviceList = this.referDetails.refrredToAdditionalServiceList
+ .map((service: any) => service.serviceName)
+ .filter((name: any) => name !== null && name !== '')
+ .join(',');
+ }
+
+ if (this.referDetails && this.referDetails.referralReason) {
+ console.log('institute', this.referDetails.referralReason);
+ for (let i = 0; i < this.referDetails.referralReason.length; i++) {
+ if (this.referDetails.referralReason[i]) {
+ this.referralReasonList += this.referDetails.referralReason[i];
+ if (i >= 0 && i < this.referDetails.referralReason.length - 1)
+ this.referralReasonList += ',';
+ }
+ }
+ }
+ }
+ console.log(
+ 'referDetailsForRefer',
+ JSON.stringify(this.referDetails, null, 4),
+ );
+ if (
+ this.casesheetData &&
+ this.casesheetData.doctorData.Refer &&
+ this.referDetails.revisitDate &&
+ !moment(this.referDetails.revisitDate, 'DD/MM/YYYY', true).isValid()
+ ) {
+ const sDate = new Date(this.referDetails.revisitDate);
+ this.referDetails.revisitDate = [
+ this.padLeft.apply(sDate.getDate()),
+ this.padLeft.apply(sDate.getMonth() + 1),
+ this.padLeft.apply(sDate.getFullYear()),
+ ].join('/');
+ }
+
this.downloadSign();
this.getVaccinationTypeAndDoseMaster();
}
diff --git a/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css b/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css
index 384f864..c89d96c 100644
--- a/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css
+++ b/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.css
@@ -87,4 +87,13 @@ ul li div {
.totalCount,
.description {
padding-top: 15px;
+}
+@media screen and (min-width:360px) and (max-width:430px) {
+ .fit_to_content{
+ width: fit-content !important;
+
+ }
+ .mat_blue{
+ margin-top: 2px;
+ }
}
\ No newline at end of file
diff --git a/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.html b/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.html
index dcf47c7..65d449d 100644
--- a/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.html
+++ b/src/app/app-modules/nurse-doctor/doctor-tm-future-worklist/tm-future-worklist.component.html
@@ -1,6 +1,6 @@
-
+
-
+
|