Skip to content

Commit

Permalink
Merge branch 'stable' into ont_mcedt_conformance
Browse files Browse the repository at this point in the history
  • Loading branch information
Colcamex Resources Inc committed Mar 7, 2022
2 parents 04e226f + 393207e commit 40640c0
Show file tree
Hide file tree
Showing 149 changed files with 193 additions and 17,410 deletions.
Binary file added local_repo/cds/cds_hrm/1.1.2/cds_hrm-1.1.2.jar
View file
Binary file not shown.
9 changes: 9 additions & 0 deletions local_repo/cds/cds_hrm/1.1.2/cds_hrm-1.1.2.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>cds</groupId>
<artifactId>cds_hrm</artifactId>
<version>1.1.2</version>
<description>POM was created from install:install-file</description>
</project>
55 changes: 11 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@
<url>http://oscarmcmaster.sourceforge.net/m2</url>
</repository>

<!-- MARC-HI (Everest & SHIC) -->
<!-- <repository>-->
<!-- <id>marc-te-main</id>-->
<!-- <name>MARC-HI Technology Exchange Private Maven Repository</name>-->
<!-- <url>http://te.marc-hi.ca/mvn</url>-->
<!-- </repository>-->

</repositories>

<pluginRepositories>
Expand Down Expand Up @@ -619,7 +612,7 @@
<dependency>
<groupId>cds</groupId>
<artifactId>cds_hrm</artifactId>
<version>4.3.1</version>
<version>1.1.2</version>
</dependency>

<!-- HRM module -->
Expand Down Expand Up @@ -1083,33 +1076,6 @@
<version>2014.10.24</version>
</dependency>

<!-- MARC-HI - Everest Framework -->
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-core</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-rmim-ca-r02-04-03</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-rmim-uv-cdar2</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-its1</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.marc.everest</groupId>
<artifactId>everest-formatters-xml-dt-r1</artifactId>
<version>1.1.0</version>
</dependency>

<!-- MARC-HI - Shared Health Integration Components (SHIC) Library -->
<dependency>
<groupId>org.marc.shic</groupId>
Expand Down Expand Up @@ -1706,15 +1672,16 @@
<configuration>
<skipTests>false</skipTests>
<argLine>-Xms512m -Xmx512m -Xss256k -XX:MaxNewSize=64m -XX:MaxPermSize=192m</argLine>
<excludes>
<exclude>**/AR2005*.java</exclude>
<exclude>**/OntarioMDSpec4DataTest.java</exclude>
<exclude>**/ONAREnhancedBornConnectorTest.java</exclude>
</excludes>
<systemPropertyVariables>
<oscar.dbinit.skip>${oscar.dbinit.skip}</oscar.dbinit.skip>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
<excludes>
<exclude>**/AR2005*.java</exclude>
<exclude>**/OntarioMDSpec4DataTest.java</exclude>
<exclude>**/ONAREnhancedBornConnectorTest.java</exclude>
<exclude>org/oscarehr/e2e/**/*.java</exclude>
</excludes>
<systemPropertyVariables>
<oscar.dbinit.skip>${oscar.dbinit.skip}</oscar.dbinit.skip>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
</configuration>
<version>2.10</version>
</plugin>
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/org/oscarehr/common/model/Document.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ public class Document extends AbstractModel<Integer> implements Serializable {
private Integer numberofpages;
@Column(name="appointment_no")
private Integer appointmentNo;
@Column(name="abnormal")
private Boolean abnormal;
@Column(name="abnormal", columnDefinition = "integer default 0")
private boolean abnormal;
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name = "document_no", insertable = false, updatable = false)
private List<DocumentReview> reviews = new ArrayList<DocumentReview>();
Expand Down Expand Up @@ -375,9 +375,6 @@ public void setAppointmentNo(Integer appointmentNo) {
}

public boolean isAbnormal() {
if (abnormal == null)
abnormal = false;

return abnormal;
}
public void setAbnormal(boolean abnormal) {
Expand Down
216 changes: 0 additions & 216 deletions src/main/java/org/oscarehr/common/service/E2ESchedulerJob.java
View file

This file was deleted.

28 changes: 14 additions & 14 deletions src/main/java/org/oscarehr/e2e/constant/Mappings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
import org.marc.everest.datatypes.generic.PIVL;
import org.marc.everest.datatypes.interfaces.ISetComponent;
import org.marc.everest.rmim.uv.cdar2.vocabulary.AdministrativeGender;
import org.oscarehr.e2e.constant.Constants.IssueCodes;
import org.oscarehr.e2e.util.EverestUtils;
//import org.oscarehr.e2e.constant.Constants.IssueCodes;
//import org.oscarehr.e2e.util.EverestUtils;

public class Mappings {
Mappings() {
Expand Down Expand Up @@ -125,18 +125,18 @@ public class Mappings {
allergyTestName = Collections.unmodifiableMap(map);
}

public static final Map<IssueCodes, Long> issueId;
static {
Map<IssueCodes, Long> map = new HashMap<IssueCodes, Long>();
map.put(Constants.IssueCodes.OMeds, EverestUtils.getIssueID(Constants.IssueCodes.OMeds.toString()));
map.put(Constants.IssueCodes.SocHistory, EverestUtils.getIssueID(Constants.IssueCodes.SocHistory.toString()));
map.put(Constants.IssueCodes.MedHistory, EverestUtils.getIssueID(Constants.IssueCodes.MedHistory.toString()));
map.put(Constants.IssueCodes.Concerns, EverestUtils.getIssueID(Constants.IssueCodes.Concerns.toString()));
map.put(Constants.IssueCodes.Reminders, EverestUtils.getIssueID(Constants.IssueCodes.Reminders.toString()));
map.put(Constants.IssueCodes.FamHistory, EverestUtils.getIssueID(Constants.IssueCodes.FamHistory.toString()));
map.put(Constants.IssueCodes.RiskFactors, EverestUtils.getIssueID(Constants.IssueCodes.RiskFactors.toString()));
issueId = Collections.unmodifiableMap(map);
}
// public static final Map<IssueCodes, Long> issueId;
// static {
// Map<IssueCodes, Long> map = new HashMap<IssueCodes, Long>();
// map.put(Constants.IssueCodes.OMeds, EverestUtils.getIssueID(Constants.IssueCodes.OMeds.toString()));
// map.put(Constants.IssueCodes.SocHistory, EverestUtils.getIssueID(Constants.IssueCodes.SocHistory.toString()));
// map.put(Constants.IssueCodes.MedHistory, EverestUtils.getIssueID(Constants.IssueCodes.MedHistory.toString()));
// map.put(Constants.IssueCodes.Concerns, EverestUtils.getIssueID(Constants.IssueCodes.Concerns.toString()));
// map.put(Constants.IssueCodes.Reminders, EverestUtils.getIssueID(Constants.IssueCodes.Reminders.toString()));
// map.put(Constants.IssueCodes.FamHistory, EverestUtils.getIssueID(Constants.IssueCodes.FamHistory.toString()));
// map.put(Constants.IssueCodes.RiskFactors, EverestUtils.getIssueID(Constants.IssueCodes.RiskFactors.toString()));
// issueId = Collections.unmodifiableMap(map);
// }

public static final Map <String, String> formCode;
static {
Expand Down
Loading

0 comments on commit 40640c0

Please sign in to comment.