Commit Graph

7051 Commits

Author SHA1 Message Date
Tadgh f85f7c0237
Merge pull request #2117 from jamesagnew/gg_20201006_dep_update
Update dependencies
2020-10-07 11:13:45 -04:00
ianmarshall 46b2fde1db Fixed tests to accommodate suggested changes from code review. 2020-10-07 11:07:34 -04:00
IanMMarshall 1bac646dc3
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:54 -04:00
IanMMarshall e24e233ec6
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/LoadedFileDescriptors.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-07 11:01:47 -04:00
ianmarshall 0f39eeb0e9 Bug fix and test improvements. 2020-10-06 21:22:09 -04:00
Tadgh f347f95f85 rollback elastic 2020-10-06 19:04:10 -04:00
Tadgh 47207e11d1 Merge branch 'gg_20201006_dep_update' of github.com:jamesagnew/hapi-fhir into gg_20201006_dep_update 2020-10-06 17:20:33 -04:00
Tadgh 5a29fd9945 rollback the elastic changes 2020-10-06 17:20:11 -04:00
ianmarshall f044f9c47e Merge remote-tracking branch 'origin/master' into im_20201005_loincpartlink_fix 2020-10-06 14:55:57 -04:00
ianmarshall d9841e59ac Restore ability to load LOINC PartLink data from a single file for pre-2.68 versions. 2020-10-06 14:36:23 -04:00
Tadgh bac43d480f Update dependencies 2020-10-06 14:14:17 -04:00
jamesagnew edbd089092 Docs update 2020-10-06 05:52:22 -04:00
IanMMarshall ce54d28a23
Merge pull request #2116 from jamesagnew/im_2020_09_29_term_doc_updates
Im 2020 09 29 term doc updates
2020-10-05 16:24:17 -04:00
IanMMarshall 5ec1284b8a
Apply suggestions from code review
Edits per code review.

Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-10-05 15:14:39 -04:00
ianmarshall 30e50ba90c Improvements to terminology documentation. 2020-10-05 14:08:29 -04:00
ianmarshall 4ca739e223 Improvements to terminology documentation. 2020-10-05 12:02:01 -04:00
ianmarshall 03bd94462d Fix typo in changelog. 2020-10-05 10:13:08 -04:00
ianmarshall 2258d37283 Documentation for terminology. 2020-10-05 09:02:00 -04:00
ianmarshall 8613e76659 Documentation for terminology. 2020-10-04 21:20:19 -04:00
IanMMarshall f1710fd0be
Merge pull request #2081 from jamesagnew/feature_2020_09_02_term_multi_version_support
Feature 2020 09 02 term multi version support
2020-10-01 12:24:40 -04:00
ianmarshall 7899837fe0 Replaced references to SystemIdentifier with SystemUrlAndVersion. 2020-09-30 22:04:08 -04:00
ianmarshall 90f1981817 Updated tests for missed dstu2 code coverage. 2020-09-30 18:10:57 -04:00
Tadgh 8760fcba87
Merge pull request #2109 from jamesagnew/gg_20200930-accessor-name
Rename accessors, fix whitespace
2020-09-30 14:37:47 -04:00
Tadgh 66a0115340 Missed a space 2020-09-30 11:13:40 -04:00
Tadgh ca52268249 Rename accessors, fix whitespace 2020-09-30 11:11:56 -04:00
jamesagnew 6fc1c5c85b Add license headers 2020-09-30 05:42:09 -04:00
ianmarshall dc3443665c Changes per code review. 2020-09-29 21:12:27 -04:00
ianmarshall 8e7b4e8437 Changes per code review. 2020-09-29 21:05:28 -04:00
Ken Stevens d71121e268 oops 2020-09-29 17:37:09 -04:00
Ken Stevens 09d09233ff
empi bugfixes and enhancements (#2104) 2020-09-29 17:27:43 -04:00
IanMMarshall c593958d2c
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 15:16:46 -04:00
IanMMarshall d63c15ef09
Apply suggestions from code review
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:57 -04:00
IanMMarshall 43c16e1737
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:27:03 -04:00
IanMMarshall 43b6bd38ff
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:26:30 -04:00
IanMMarshall 2be47b5567
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:21 -04:00
IanMMarshall b8531e599f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:18:00 -04:00
IanMMarshall 3940e7526f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:36 -04:00
IanMMarshall 6aa1a5ec3f
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:17:19 -04:00
IanMMarshall ebb3fa0ca1
Update hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:56 -04:00
IanMMarshall 10620a8bb4
Update hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderCodeSystemDstu3.java
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 14:16:13 -04:00
IanMMarshall 26688aac65
Update hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties
Co-authored-by: Diederik Muylwyk <diederik.muylwyk@gmail.com>
2020-09-29 12:11:56 -04:00
ianmarshall 42b4e9ae02 Add change log. 2020-09-28 08:45:59 -04:00
ianmarshall 9d8664ccd8 Additional tests and updates. 2020-09-27 21:09:06 -04:00
ianmarshall e86d9deaac Additional tests. 2020-09-27 17:45:15 -04:00
ianmarshall 732624bfaf Fix broken JUnit test. 2020-09-25 22:55:01 -04:00
ianmarshall 1dc4a533d6 Fixes to terminology loader. 2020-09-25 21:43:15 -04:00
ianmarshall 47244c54dc Merge remote-tracking branch 'origin/feature_2020_09_02_term_multi_version_support' into im_20200728_term_multi_version_support
# Conflicts:
#	hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/dao/IFhirResourceDaoCodeSystem.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseTermReadSvcImpl.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java
#	hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
#	hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/CommonCodeSystemsTerminologyService.java
2020-09-25 09:10:07 -04:00
ianmarshall 6f9874468a Merge remote-tracking branch 'origin/master' into feature_2020_09_02_term_multi_version_support 2020-09-25 08:54:17 -04:00
ianmarshall 2bceacd9a6 Update loader to ensure that ConceptMap and ValueSet Ids are unique for each version loaded. 2020-09-25 08:51:53 -04:00
ianmarshall 5fe46be41c Validate code changes and new tests. 2020-09-24 18:51:47 -04:00