Merge pull request #242 from palladiumkenya/3.xchanges

production 3.x version
palladiumkenya · Nov 14, 2024 · 24f4cb6 · 24f4cb6
2 parents 27d200f + d20de02
commit 24f4cb6
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 7 deletions.
diff --git a/src/Dwapi.ExtractsManagement.Core/Profiles/Dwh/CtExtractProfile.cs b/src/Dwapi.ExtractsManagement.Core/Profiles/Dwh/CtExtractProfile.cs
@@ -391,7 +391,9 @@ public CtExtractProfile()
                 .ForMember(x => x.Date_Last_Modified, o => o.MapFrom(s => s.GetOptionalNullDateOrDefault(nameof(TempAllergiesChronicIllnessExtract.Date_Last_Modified))))
                 .ForMember(x => x.Voided, o => o.MapFrom(s => s.GetNullIntOrDefault(nameof(TempAllergiesChronicIllnessExtract.Voided))))
                 .ForMember(x => x.RecordUUID, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.RecordUUID))))
-                .ForMember(x => x.Controlled, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.Controlled))));
+                .ForMember(x => x.Controlled, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.Controlled))))
+                .ForMember(x => x.PatientHasChronicIllness, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.PatientHasChronicIllness))));
+
 
 
             CreateMap<TempAllergiesChronicIllnessExtract,AllergiesChronicIllnessExtract>();

diff --git a/src/Dwapi.ExtractsManagement.Core/Profiles/Dwh/DiffCtExtractProfile.cs b/src/Dwapi.ExtractsManagement.Core/Profiles/Dwh/DiffCtExtractProfile.cs
@@ -474,7 +474,8 @@ public DiffCtExtractProfile()
                 .ForMember(x => x.Date_Last_Modified, o => o.MapFrom(s => s.GetOptionalNullDateOrDefault(nameof(TempAllergiesChronicIllnessExtract.Date_Last_Modified))))
                 .ForMember(x => x.Voided, o => o.MapFrom(s => s.GetNullIntOrDefault(nameof(TempAllergiesChronicIllnessExtract.Voided))))
                 .ForMember(x => x.RecordUUID, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.RecordUUID))))
-                .ForMember(x => x.Controlled, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.Controlled)))); 
+                .ForMember(x => x.Controlled, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.Controlled))))
+                .ForMember(x => x.PatientHasChronicIllness, o => o.MapFrom(s => s.GetStringOrDefault(nameof(TempAllergiesChronicIllnessExtract.PatientHasChronicIllness))));
 
             CreateMap<TempAllergiesChronicIllnessExtract,AllergiesChronicIllnessExtract>();
 

diff --git a/src/Dwapi.SettingsManagement.Infrastructure/Seed/EmrSystems.csv b/src/Dwapi.SettingsManagement.Infrastructure/Seed/EmrSystems.csv
@@ -1,6 +1,6 @@
 Id|Name|Version|IsMiddleware|IsDefault|EmrSetup
 a62216ee-0e85-11e8-ba89-0ed5f89f718b|IQCare|2.2.1|0|0|0
-a6221856-0e85-11e8-ba89-0ed5f89f718b|KenyaEMR|19.1.1|0|1|0
+a6221856-0e85-11e8-ba89-0ed5f89f718b|KenyaEMR|19.1.3|0|1|0
 a6221857-0e85-11e8-ba89-0ed5f89f718b|AMRS|1|0|0|0
 a6221858-0e85-11e8-ba89-0ed5f89f718b|ECare|1|0|0|0
 a6221859-0e85-11e8-ba89-0ed5f89f718b|FACES|1|0|0|1

diff --git a/src/Dwapi/client-src/environments/environment.prod.ts b/src/Dwapi/client-src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ export const environment = {
     production: true,
     port: '5753',
     emrs: [
-        {name: 'KenyaEMR', version: '19.1.1'},
+        {name: 'KenyaEMR', version: '19.1.3'},
         {name: 'IQCare', version: '2.2.1'}
     ]
 };
diff --git a/src/Dwapi/client-src/environments/environment.qa.docker.ts b/src/Dwapi/client-src/environments/environment.qa.docker.ts
@@ -2,7 +2,7 @@ export const environment = {
     production: false,
     port: '5959',
     emrs: [
-        {name: 'KenyaEMR', version: '19.1.1'},
+        {name: 'KenyaEMR', version: '19.1.3'},
         {name: 'IQCare', version: '2.2.1'}
     ]
 };
diff --git a/src/Dwapi/client-src/environments/environment.qa.ts b/src/Dwapi/client-src/environments/environment.qa.ts
@@ -2,7 +2,7 @@ export const environment = {
     production: false,
     port: '5753',
     emrs: [
-        {name: 'KenyaEMR', version: '19.1.1'},
+        {name: 'KenyaEMR', version: '19.1.3'},
         {name: 'IQCare', version: '2.2.1'}
     ]
 };
diff --git a/src/Dwapi/client-src/environments/environment.ts b/src/Dwapi/client-src/environments/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
     production: false,
     port: '5757',
     emrs: [
-        {name: 'KenyaEMR', version: '19.1.1'},
+        {name: 'KenyaEMR', version: '19.1.3'},
         {name: 'IQCare', version: '2.2.1'}
     ]
 };
diff --git a/...ent-src/Upload/file-upload.component.html → ...ent-src/upload/file-upload.component.html b/...ent-src/Upload/file-upload.component.html → ...ent-src/upload/file-upload.component.html
diff --git a/...ent-src/Upload/file-upload.component.scss → ...ent-src/upload/file-upload.component.scss b/...ent-src/Upload/file-upload.component.scss → ...ent-src/upload/file-upload.component.scss
diff --git a/...lient-src/Upload/file-upload.component.ts → ...lient-src/upload/file-upload.component.ts b/...lient-src/Upload/file-upload.component.ts → ...lient-src/upload/file-upload.component.ts
diff --git a/...lient-src/Upload/upload.directive.spec.ts → ...lient-src/upload/upload.directive.spec.ts b/...lient-src/Upload/upload.directive.spec.ts → ...lient-src/upload/upload.directive.spec.ts
diff --git a/...api/client-src/Upload/upload.directive.ts → ...api/client-src/upload/upload.directive.ts b/...api/client-src/Upload/upload.directive.ts → ...api/client-src/upload/upload.directive.ts