Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
histream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Raphael
histream
Commits
8e488059
Commit
8e488059
authored
Jan 18, 2017
by
R.W.Majeed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed non-working dropfact/conceptoverride for value mappings
parent
5e0a72e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
histream-import/src/main/java/de/sekmi/histream/etl/config/Concept.java
...t/src/main/java/de/sekmi/histream/etl/config/Concept.java
+14
-10
histream-import/src/main/java/de/sekmi/histream/etl/config/WideTable.java
...src/main/java/de/sekmi/histream/etl/config/WideTable.java
+3
-1
No files found.
histream-import/src/main/java/de/sekmi/histream/etl/config/Concept.java
View file @
8e488059
...
...
@@ -77,17 +77,8 @@ public class Concept{
String
concept
=
this
.
id
;
MapFeedback
mf
=
new
MapFeedback
();
if
(
mf
.
isActionDrop
()
){
return
null
;
// ignore this fact
}
if
(
mf
.
hasConceptOverride
()
){
concept
=
mf
.
getConceptOverride
();
}
Observation
o
=
factory
.
createObservation
(
patid
,
concept
,
start
);
if
(
visit
!=
null
){
o
.
setEncounterId
(
visit
);
}
// parse value
String
unit
=
null
;
if
(
this
.
unit
!=
null
){
unit
=
this
.
unit
.
valueOf
(
map
,
row
);
...
...
@@ -98,6 +89,18 @@ public class Concept{
// Objects.requireNonNull(this.value, "No value for concept: "+id);
val
=
this
.
value
.
valueOf
(
map
,
row
,
mf
);
}
if
(
mf
.
hasConceptOverride
()
){
concept
=
mf
.
getConceptOverride
();
}
if
(
mf
.
isActionDrop
()
){
return
null
;
// ignore this fact
}
Observation
o
=
factory
.
createObservation
(
patid
,
concept
,
start
);
if
(
visit
!=
null
){
o
.
setEncounterId
(
visit
);
}
if
(
val
==
null
){
// no value
o
.
setValue
(
null
);
...
...
@@ -117,6 +120,7 @@ public class Concept{
throw
new
ParseException
(
"Unsupported value type for concept id "
+
this
.
id
+
": "
+
val
.
getClass
());
}
// TODO: modifiers
return
o
;
...
...
histream-import/src/main/java/de/sekmi/histream/etl/config/WideTable.java
View file @
8e488059
...
...
@@ -50,7 +50,9 @@ public class WideTable extends Table<WideRow> implements ConceptTable{
WideRow
rec
=
new
WideRow
(
patid
,
visit
);
for
(
Concept
c
:
concepts
){
Observation
o
=
c
.
createObservation
(
patid
,
visit
,
factory
,
map
,
row
);
rec
.
addFact
(
o
);
if
(
o
!=
null
){
rec
.
addFact
(
o
);
}
}
return
rec
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment