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.

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

Bindu, Kavitha | Merge Bahmni-IPD-master to master branch #55

Closed
wants to merge 91 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
de7bca3
[Ritesh] | BAH-3148 | Create and fetch medication task (#1)
riteshghiya90 Nov 28, 2023
b81a411
A-1205974389432443 | Feedbacks on Medication Schedule (#3)
Arjun-Go Dec 4, 2023
2084c7b
add. changes to automate omod publish for Bahmni-IPD-master branch (#4)
Arjun-Go Dec 11, 2023
e2bcd0a
Arjun | Fix deployment workflow (#5)
Arjun-Go Dec 11, 2023
c978be7
Medication Administration Feature (#7)
kavitha-sundararajan Jan 1, 2024
9a9571d
IPD Treatment Display Control Get API Changes & Edit Drug Chart API C…
kalai-tw Jan 5, 2024
fcf6cfe
A-1206156796138532 | Abi | add. functionality to return slot informat…
abinaya-u Jan 8, 2024
ba49841
Abi | fix. method name based on functionality
abinaya-u Jan 8, 2024
5ccfaad
Abi | fix. filter non-voided slots for the iven time frame (#10)
abinaya-u Jan 11, 2024
28efc13
Changes to accomodate Drugchart view where we need to intended and ac…
kalai-tw Jan 12, 2024
d695d2e
BAH-3460 | Kavitha | refactor save adhoc medications (#13)
kavitha-sundararajan Jan 16, 2024
24b6d13
Changes to stop/void slots associated with drugorder when its stopped…
kalai-tw Jan 16, 2024
c9f4bc0
BAH-3460 | fix provider uuid issue for schedule creation (#14)
kavitha-sundararajan Jan 18, 2024
1361ee7
Nursing task enhancement (#15)
abinaya-u Jan 22, 2024
2a09418
Abi | fix. schedule notes issue (#17)
abinaya-u Jan 25, 2024
2127545
Provider acknowledge flow changes - Update API Introduced for Medicat…
kalai-tw Jan 29, 2024
97e4823
Kavitha | fix slot creation logic for 1 day (#19)
kavitha-sundararajan Jan 31, 2024
29c3372
Kavitha | add void condition in fetching slots (#20)
kavitha-sundararajan Jan 31, 2024
9ec1a07
Abi | update. status as Stopped once administered and stopped a medic…
abinaya-u Feb 1, 2024
1ecd098
Changes to bring drug order one visit previous to current visit
kalai-tw Feb 1, 2024
449107e
update. shift api to return slots based on visitUuid
abinaya-u Feb 2, 2024
4c325b6
add. check to avoid multiple save (#23)
abinaya-u Feb 2, 2024
22980ba
Merge branch 'Bahmni-IPD-master' into ipd-read-mode
abinaya-u Feb 3, 2024
a65e633
update. filter slots for drugChart based on visit uuid
abinaya-u Feb 5, 2024
1b85359
Test Case Fix for new change added
kalai-tw Feb 5, 2024
d04c708
API to save/schedule the placeholder Tasks for PRN (#24)
Arjun-Go Feb 6, 2024
0a22ff6
update. modify imports to have static imports
abinaya-u Feb 7, 2024
7cd30a6
Merge branch 'Bahmni-IPD-master' into ipd-read-mode
SooryaKumaranC-tw Feb 7, 2024
f406017
Merge pull request #25 from Bahmni/ipd-read-mode
SooryaKumaranC-tw Feb 7, 2024
d46a835
pendingSlotsAvailable Key added to know whether any pending slots is …
kalai-tw Feb 7, 2024
7d0b4bc
Merge pull request #26 from Bahmni/stop-drug-show-fix
srinithishg Feb 7, 2024
0caa4a8
condition added to check if slotstart time is after current time (#27)
kalai-tw Feb 7, 2024
c980030
[Sri/kalai] - get the pending slots after the current time in drug or…
srinithishg Feb 7, 2024
4366fc1
Merge pull request #28 from Bahmni/bugfix-stopdrug
srinithishg Feb 7, 2024
4c48c41
Change to consider MedicationRequest as a default serviceType if is n…
kalai-tw Feb 8, 2024
923828b
MAde Visit UUid as non-mandatory Param, if visit is not send consider…
kalai-tw Feb 8, 2024
80ad1b3
Change to consider MedicationRequest as a default serviceType if is n…
kalai-tw Feb 8, 2024
4a61a4e
Backend changed to accomodate prn slots
kalai-tw Feb 9, 2024
f272b84
added First Slot Start time to response in DrugOrderSchedule
kalai-tw Feb 9, 2024
de43977
Merge remote-tracking branch 'origin/Bahmni-IPD-master' into prn-drug…
kalai-tw Feb 13, 2024
9cefd25
Merge pull request #31 from Bahmni/prn-workflow
SooryaKumaranC-tw Feb 14, 2024
6c41942
Kavitha | add api to fetch slots by patient list with custom includes…
kavitha-sundararajan Feb 15, 2024
a20a580
Ward Level DashBoard API Changes (#30)
kalai-tw Feb 19, 2024
ab4e348
Kavitha | add null check to get slots for list of patients (#34)
kavitha-sundararajan Feb 22, 2024
b7d9507
Search functionality API added & Refactor get patients API (#33)
kalai-tw Feb 22, 2024
dc5230e
Add boolean key to show if all slots are attended (#35)
kalai-tw Feb 28, 2024
1bd9b4d
Add totalPatient in Patient List & Search API response
umair-fayaz Feb 29, 2024
0f4916b
Add missing classes
umair-fayaz Feb 29, 2024
87b5bc4
Merge pull request #36 from Bahmni/total-patients
umair-fayaz Feb 29, 2024
f7352e6
Kavitha | refactored slot creation logic for continuous medication (#38)
kavitha-sundararajan Mar 5, 2024
063bcef
add. scheduler to mark non-administered slots as missed (#39)
abinaya-u Mar 5, 2024
4785da8
Bookmarking API - API To Create Care Team & its Participants (#37)
kalai-tw Mar 6, 2024
d29bbc9
Adds careTeam information to AdmittedPatient (#40)
umair-fayaz Mar 11, 2024
83d3e08
Adds visitDetails to AdmittedPatientResponse
umair-fayaz Mar 12, 2024
1b53908
Merge pull request #41 from Bahmni/visit-details
umair-fayaz Mar 12, 2024
5809e89
Removed starttime,endtime & provider in update flow (#42)
kalai-tw Mar 13, 2024
64b65c4
Adds provider details and time check for getAdmittedPatients
umair-fayaz Mar 14, 2024
3ef205f
Change LocalDateTime to Date
umair-fayaz Mar 15, 2024
3fcf066
Rename methods
umair-fayaz Mar 18, 2024
3f77311
Merge pull request #43 from Bahmni/ct-participant-patients
umair-fayaz Mar 18, 2024
917277b
Adds ability to sort by Bed Number
umair-fayaz Mar 18, 2024
fa931e2
CareTeam info added to search API as well (#44)
kalai-tw Mar 18, 2024
5762c79
Removed CareTeam Particpants join condition (#45)
kalai-tw Mar 18, 2024
722e4c1
Changes Inner join to left outer join
umair-fayaz Mar 19, 2024
a493e8c
Makes sortBy optional parameter
umair-fayaz Mar 19, 2024
834af83
Merge branch 'Bahmni-IPD-master' into sort-by-bed-number
umair-fayaz Mar 19, 2024
db25995
Add a check in generateGroupByClauseForSorting to handle null values
umair-fayaz Mar 19, 2024
1206481
Extract ORDER BY from GROUP BY
umair-fayaz Mar 19, 2024
21930b1
Merge pull request #46 from Bahmni/sort-by-bed-number
umair-fayaz Mar 20, 2024
5191876
Add myPatient count for provider in summary API
umair-fayaz Mar 21, 2024
b208b49
Include void check for provider patients
umair-fayaz Mar 22, 2024
29ae167
Include currentDateTime for provider shift validation
umair-fayaz Mar 22, 2024
c37c286
Merge pull request #47 from Bahmni/my-patient-count
umair-fayaz Mar 26, 2024
f219c9a
BAH-3723|Kavitha| Event handling model & create task for admit event …
kavitha-sundararajan Apr 3, 2024
d478f15
Add scheduler, liquibase and handleEvent for shift start task
SooryaKumaranC-tw Apr 4, 2024
78f9673
Move Events to api, refactor and include shift start task scheduler
SooryaKumaranC-tw Apr 9, 2024
98c8cf2
Update api pom.xml
SooryaKumaranC-tw Apr 9, 2024
71af6ca
Add scheduler task for rollover medication tasks
umair-fayaz Apr 9, 2024
66b96de
Gets rollover tasks from fhir task service using task names and status
umair-fayaz Apr 9, 2024
c354016
Add migration top add scheduler for rollover tasks
umair-fayaz Apr 9, 2024
f852bec
Create start shift scheduler and roll over tasks
SooryaKumaranC-tw Apr 11, 2024
9d8e166
Update and Refactor the rollover and shift start task
SooryaKumaranC-tw Apr 13, 2024
1324ca4
Remove the emrapi dependency
SooryaKumaranC-tw Apr 13, 2024
cff31ac
Refactor the method names
SooryaKumaranC-tw Apr 15, 2024
3d23bcf
Merge pull request #49 from Bahmni/create-shift-scheduler
SooryaKumaranC-tw Apr 15, 2024
f02745e
Rename the scheduler name
SooryaKumaranC-tw Apr 16, 2024
23adce7
Merge pull request #50 from Bahmni/fix-rollover-changeset
SooryaKumaranC-tw Apr 16, 2024
c04364a
Add filters on drugorder while showing count (#51)
kalai-tw Apr 18, 2024
2a1883b
[Ashish]Add. Two new frequencies are added to medications
AshishkurianTw Apr 25, 2024
f68d36a
Merge pull request #52 from Bahmni/feedback-set-1
AshishkurianTw Apr 25, 2024
d4f6636
Abi | add. privilege checks for endpoints (#54)
abinaya-u May 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/build_publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build and Publish package
on:
push:
branches:
- main
- Bahmni-IPD-master
workflow_dispatch:

jobs:
build-publish-package:
name: Build and Publish package
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
server-id: nexus-sonatype
server-username: NEXUS_USERNAME
server-password: NEXUS_PASSWORD
- name: Build and deploy with Maven
run: ./mvnw --no-transfer-progress clean -U deploy
env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
22 changes: 22 additions & 0 deletions .github/workflows/validate_pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven

on:
pull_request:
branches: [ Bahmni-IPD-master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Maven
run: mvn clean package
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
*.class
.settings
.project
.classpath
.talismanrc
target

# Package Files #
*.jar
*.marker
*.war
*.ear
.idea
.DS_Store

/omod/target/*
/api/target/*
*.iml
*/logs/*
logs/*
classes/
.mvn/wrapper/*.jar
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
661 changes: 661 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
# openmrs-module-ipd
Openmrs module for Bahmni IPD Care and Monitoring

OpenMRS Module Bahmni-events Backend
=================================
This repository handles Bahmni IPD Care and Monitoring.

## Packaging
```mvn clean package```

### Prerequisite
JDK 1.8

## Deploy

Copy ```openmrs-module-ipd/omod/target/bahmni-ipd-1.0.0-SNAPSHOT.omod``` into OpenMRS modules directory and restart OpenMRS
219 changes: 219 additions & 0 deletions api/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bahmni.module</groupId>
<artifactId>bahmni-ipd</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>bahmni-ipd-api</artifactId>
<packaging>jar</packaging>
<name>Bahmni IPD API</name>
<description>Bahmni IPD API contains all backend APIs for IPD</description>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!--<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacocoVersion}</version>
<configuration>
<includes>
<include>**/*</include>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*Activator.class</exclude>
<exclude>**/configuration/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacocoVersion}</version>
<executions>
<execution>
<id>check</id>
<goals>
<goal>report</goal>
<goal>check</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/jacoco-reports</outputDirectory>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>-->
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>bedmanagement-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-common</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-2.0</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>fhir2-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>fhir2-omod</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bahmni.module</groupId>
<artifactId>fhir2Extension-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bahmni.module</groupId>
<artifactId>fhir2Extension-omod</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bahmni.module</groupId>
<artifactId>medication-administration-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openmrs.test</groupId>
<artifactId>openmrs-test</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
</dependencies>

</project>


22 changes: 22 additions & 0 deletions api/src/main/java/org/openmrs/module/ipd/api/IPDActivator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.openmrs.module.ipd.api;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.openmrs.module.BaseModuleActivator;

/**
* This class contains the logic that is run every time this module is either started or shutdown
*/
public class IPDActivator extends BaseModuleActivator {

private final Log log = LogFactory.getLog(this.getClass());

public void startup() {
log.info("Starting Basic Module");
}

public void shutdown() {
log.info("Shutting down Basic Module");
}

}
14 changes: 14 additions & 0 deletions api/src/main/java/org/openmrs/module/ipd/api/dao/CareTeamDAO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.openmrs.module.ipd.api.dao;

import org.openmrs.Visit;
import org.openmrs.api.db.DAOException;
import org.openmrs.module.ipd.api.model.CareTeam;
import org.openmrs.module.ipd.api.model.Schedule;

public interface CareTeamDAO {

CareTeam saveCareTeam(CareTeam careTeam) throws DAOException;

CareTeam getCareTeamByVisit(Visit visit) throws DAOException;

}
15 changes: 15 additions & 0 deletions api/src/main/java/org/openmrs/module/ipd/api/dao/ReferenceDAO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.openmrs.module.ipd.api.dao;

import org.openmrs.api.db.DAOException;
import org.openmrs.module.ipd.api.model.Reference;
import org.springframework.stereotype.Repository;

import java.util.Optional;

@Repository
public interface ReferenceDAO {

Optional<Reference> getReferenceByTypeAndTargetUUID(String type, String targetUUID) throws DAOException;

Reference saveReference(Reference reference) throws DAOException;
}
Loading
Loading