Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plat 2.1.x #95

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Plat 2.1.x #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c6da5ed
minor fix to run on 2.1.x
mozzy11 Apr 20, 2022
4718932
Merge pull request #94 from mozzy11/plat_2.x.1
mozzy11 Apr 20, 2022
10352df
Update pom.xml
mozzy11 Apr 20, 2022
2e9c738
update form to support Lab On FHIR workflows
mozzy11 Jun 7, 2022
8330334
remove post submission
mozzy11 Jun 15, 2022
0a2ecbf
add multiple bramches
mozzy11 Jun 15, 2022
6289b6e
update Lab form to use lab On FHIR openelis url
mozzy11 Jun 20, 2022
f830cf2
switch to using post submission action
mozzy11 Aug 14, 2022
3a5f1af
update version
mozzy11 Aug 16, 2022
1ed42bc
update get lab histroy service
mozzy11 Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ main ]
branches: [ main ,plat_2.1.x ]
pull_request:
branches: [ main ]
branches: [ main ,plat_2.1.x ]
release:
types: [ created ]
# Allows you to run this workflow manually from the Actions tab
Expand Down
3 changes: 1 addition & 2 deletions api/src/main/java/org/openmrs/module/isanteplus/api/impl/IsantePlusServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,10 +783,9 @@ public List<IsantePlusObs> getLabsHistory(Patient patient) {
Concept resultTest = Context.getConceptService().getConcept(result);

for (Obs obs1 : Context.getObsService().getObservationsByPersonAndConcept(patient.getPerson(), resultTest)) {
if (obs.getEncounter().getEncounterId() == obs1.getEncounter().getEncounterId()) {
if (obs.getEncounter().getEncounterType().equals(obs1.getEncounter().getEncounterType())) {
IsantePlusObs obsres = new IsantePlusObs(obs1);
labHistory.add(obsres);

}
}
}
Expand Down
10 changes: 5 additions & 5 deletions api/src/main/resources/liquibase.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@
</sql>
</changeSet>

<changeSet dbms="mysql" id="2018August27-18:00" author="Arkadiusz Lalo"
<changeSet dbms="mysql" id="2022April20-18:00" author="Arkadiusz Lalo"
runInTransaction="true">
<preConditions onError="HALT" onFail="MARK_RAN">
<and>
Expand All @@ -845,11 +845,11 @@
</preConditions>
<comment>Add a new concept_reference_source, which is used by LNSP codes</comment>
<sql>
INSERT INTO concept_reference_source(name, description, creator, date_created, uuid)
VALUES ('LNSP Code', 'LNSP test code', 1, CURRENT_TIMESTAMP, 'f124da75-9f50-4b25-be97-13c029e3a65b');
INSERT INTO concept_reference_source(name, description, hl7_code, creator, date_created, uuid)
VALUES ('LNSP Code', 'LNSP test code', null, 1, CURRENT_TIMESTAMP, 'f124da75-9f50-4b25-be97-13c029e3a65b');

INSERT INTO concept_reference_source(name, description, creator, date_created, uuid)
VALUES ('LNSP Result Code', 'LNSP test code', 1, CURRENT_TIMESTAMP, 'c19e926e-fc28-4d78-9b99-eb42032abf3c');
INSERT INTO concept_reference_source(name, description, hl7_code, creator, date_created, uuid)
VALUES ('LNSP Result Code', 'LNSP test code', null, 1, CURRENT_TIMESTAMP, 'c19e926e-fc28-4d78-9b99-eb42032abf3c');
</sql>
</changeSet>

Expand Down
10 changes: 5 additions & 5 deletions liquibase.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@
</sql>
</changeSet>

<changeSet dbms="mysql" id="2018August27-18:00" author="Arkadiusz Lalo"
<changeSet dbms="mysql" id="2022April20-18:00" author="Arkadiusz Lalo"
runInTransaction="true">
<preConditions onError="HALT" onFail="MARK_RAN">
<and>
Expand All @@ -845,11 +845,11 @@
</preConditions>
<comment>Add a new concept_reference_source, which is used by LNSP codes</comment>
<sql>
INSERT INTO concept_reference_source(name, description, creator, date_created, uuid)
VALUES ('LNSP Code', 'LNSP test code', 1, CURRENT_TIMESTAMP, 'f124da75-9f50-4b25-be97-13c029e3a65b');
INSERT INTO concept_reference_source(name, description, hl7_code, creator, date_created, uuid)
VALUES ('LNSP Code', 'LNSP test code', null, 1, CURRENT_TIMESTAMP, 'f124da75-9f50-4b25-be97-13c029e3a65b');

INSERT INTO concept_reference_source(name, description, creator, date_created, uuid)
VALUES ('LNSP Result Code', 'LNSP test code', 1, CURRENT_TIMESTAMP, 'c19e926e-fc28-4d78-9b99-eb42032abf3c');
INSERT INTO concept_reference_source(name, description, hl7_code, creator, date_created, uuid)
VALUES ('LNSP Result Code', 'LNSP test code', null, 1, CURRENT_TIMESTAMP, 'c19e926e-fc28-4d78-9b99-eb42032abf3c');
</sql>
</changeSet>

Expand Down
7 changes: 4 additions & 3 deletions omod/src/main/webapp/resources/htmlforms/Lab.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<htmlform formUuid="56cf5b28-c0b5-4d57-8dde-a43e93e269d2"
formName="Analyse de Laboratoire" formVersion="1.0"
formEncounterType="f037e97b-471e-4898-a07c-b8e169e0ddc4"
formDescription="Analyse de laboratoire;Analyse de laboratoire">
formDescription="Analyse de laboratoire;">
<macros>
paperFormId = (Fill this in)
<!--headerColor =#009d8e-->
Expand Down Expand Up @@ -908,10 +908,10 @@
<table>
<tr>
<td colspan="3">
<includeIf velocityTest="$fn.globalProperty('labintegration.openElis.url') != ''">
<includeIf velocityTest="$fn.globalProperty('labonfhir.openElisUrl') != ''">
<obs id="destinationOfTestOrder" labelText="Envoyez le résultat de laboratoire à:" conceptId="CIEL:160632" answers="SCC,OpenELIS" style="dropdown" />
</includeIf>
<excludeIf velocityTest="$fn.globalProperty('labintegration.openElis.url') != ''">
<excludeIf velocityTest="$fn.globalProperty('labonfhir.openElisUrl') != ''">
<obs id="destinationOfTestOrder" labelText="Envoyez le résultat de laboratoire à:" conceptId="CIEL:160632" answers="SCC" style="dropdown" />
</excludeIf>
</td>
Expand Down Expand Up @@ -3150,5 +3150,6 @@
<div id="sauvegarde">
<center><submit submitClass="confirm right" submitCode="general.save"/><br/>
</center>
<postSubmissionAction class="org.openmrs.module.isanteplusfhir.api.action.LaboratoryFormAction"/>
</div>
</htmlform>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</modules>

<properties>
<revision>1.4.2</revision>
<revision>1.4.6-SNAPSHOT</revision>
<openMRSVersion>2.0.5</openMRSVersion>
<uiframeworkVersion>3.11.0</uiframeworkVersion>
<jsonVersion>20160212</jsonVersion>
Expand Down