Skip to content

Commit

Permalink
Merge pull request #42 from PSMRI/test/upgrade
Browse files Browse the repository at this point in the history 
Test/upgrade
  • Loading branch information
@ravishanigarapu
ravishanigarapu authored May 24, 2024
2 parents 7ec2afc + 147e8c5 commit bd9f29d
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 56 deletions.
147 changes: 103 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

Expand All @@ -31,10 +31,16 @@
<environment>${ENV_VAR}</environment>
<target-properties>target/classes/application.properties</target-properties>
<source-properties>target/classes/common_${environment}.properties</source-properties>
<jacoco.version>0.8.11</jacoco.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.language>java</sonar.language>
</properties>

<dependencies>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop -->
<dependencies>
<!--
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
Expand All @@ -57,11 +63,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -105,19 +106,19 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.2.0</version>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.2.0</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>1.19.4</version>
</dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
Expand All @@ -143,12 +144,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.0-rc1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>33.0.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -163,7 +165,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220924</version>
<version>20231013</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
Expand All @@ -178,15 +180,22 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.3</version>
<version>5.2.5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.3</version>
<version>5.2.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis -->
<!--
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
Expand Down Expand Up @@ -231,22 +240,49 @@
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
<version>3.2.1</version>
</dependency>
<!-- Actuator -->
<!--
https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
</dependency>
<!-- Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
</dependency>
</dependencies>
<build>
<finalName>mmuapi-v1.0</finalName>
<plugins>

<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>9.0.8</version>
<configuration>
<format>HTML</format>
<nvdApiServerId>nvd</nvdApiServerId>
<nvdApiKey>79597933-f3cc-4601-949b-12513434ade3</nvdApiKey>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -292,7 +328,8 @@
<directory>src/main/environment</directory>
<filtering>true</filtering>
<includes>
<include>common_${environment}.properties</include>
<include>
common_${environment}.properties</include>
</includes>
</resource>
</resources>
Expand All @@ -313,11 +350,13 @@
<configuration>
<target>
<echo>
concatenating properties file ${target-properties} and
concatenating properties file
${target-properties} and
${source-properties}
</echo>
<concat destfile="${target-properties}" append="yes"
force="yes">
<concat destfile="${target-properties}"
append="yes"
force="yes">
<fileset file="${source-properties}">
</fileset>
</concat>
Expand All @@ -340,20 +379,40 @@
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-site</id>
<phase>package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version>
</dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
26 changes: 14 additions & 12 deletions src/main/java/com/iemr/mmu/service/common/transaction/CommonNurseServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2652,28 +2652,30 @@ public Long saveBenPrescription(PrescriptionDetail prescription) {

if (prescription != null && prescription.getProvisionalDiagnosisList() != null
&& prescription.getProvisionalDiagnosisList().size() > 0) {
int pointer = 1;
for (SCTDescription obj : prescription.getProvisionalDiagnosisList()) {
if (obj.getTerm() != null) {
if (pointer == prescription.getProvisionalDiagnosisList().size()) {
if(pdTerm.toString().isEmpty()){
pdTerm.append(obj.getTerm());
if (obj.getConceptID() != null)
if(null != obj.getConceptID()) {
pdConceptID.append(obj.getConceptID());
else
}else {
pdConceptID.append("N/A");
} else {
pdTerm.append(obj.getTerm()).append(" || ");
if (obj.getConceptID() != null)
pdConceptID.append(obj.getConceptID()).append(" || ");
else
pdConceptID.append("N/A").append(" || ");
}
}else{
if(obj.getTerm() != null){
pdTerm.append(" || ").append(obj.getTerm());
}
if (obj.getConceptID() != null){
pdConceptID.append(" || ").append(obj.getConceptID());
}else{
pdConceptID.append(" || ").append("N/A");
}

}
}
pointer++;
}
prescription.setDiagnosisProvided(pdTerm.toString());
prescription.setDiagnosisProvided_SCTCode(pdConceptID.toString());
// prescription.setDiagnosisProvided_SCTTerm(pdTerm.toString());

}

Expand Down

0 comments on commit bd9f29d

Please sign in to comment.