|
@@ -73,9 +73,6 @@ public class PreProcess {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- for (MedicalIndication r: reminder) {
|
|
|
|
- System.out.println(r.getName());
|
|
|
|
- }
|
|
|
|
} catch (Exception ex) {
|
|
} catch (Exception ex) {
|
|
ex.printStackTrace();
|
|
ex.printStackTrace();
|
|
} finally {
|
|
} finally {
|
|
@@ -90,6 +87,7 @@ public class PreProcess {
|
|
String minop, maxop, minunit, maxunit;
|
|
String minop, maxop, minunit, maxunit;
|
|
|
|
|
|
try {
|
|
try {
|
|
|
|
+ String detailname = lis.getDetailName();
|
|
Double numval = lis.getValue();
|
|
Double numval = lis.getValue();
|
|
String unit = lis.getUnits();
|
|
String unit = lis.getUnits();
|
|
String otherval = lis.getOtherValue();
|
|
String otherval = lis.getOtherValue();
|
|
@@ -99,7 +97,10 @@ public class PreProcess {
|
|
if (rule.getMin_operator().equals("=") && otherval.contains(rule.getMin_value())) {
|
|
if (rule.getMin_operator().equals("=") && otherval.contains(rule.getMin_value())) {
|
|
MedicalIndication medind = new MedicalIndication();
|
|
MedicalIndication medind = new MedicalIndication();
|
|
medind.setName(rule.getRemind());
|
|
medind.setName(rule.getRemind());
|
|
|
|
+ medind.setRule(detailname + ": " + otherval);
|
|
reminder.add(medind);
|
|
reminder.add(medind);
|
|
|
|
+
|
|
|
|
+ System.out.println(medind.getRule() + " -> " + medind.getName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else if (String.valueOf(numval).trim().length() > 0 && unit.length() > 0){
|
|
} else if (String.valueOf(numval).trim().length() > 0 && unit.length() > 0){
|
|
@@ -137,7 +138,10 @@ public class PreProcess {
|
|
if (minmatch && maxmatch) {
|
|
if (minmatch && maxmatch) {
|
|
MedicalIndication medind = new MedicalIndication();
|
|
MedicalIndication medind = new MedicalIndication();
|
|
medind.setName(rule.getRemind());
|
|
medind.setName(rule.getRemind());
|
|
|
|
+ medind.setRule(detailname + ": " + numval + " " + unit);
|
|
reminder.add(medind);
|
|
reminder.add(medind);
|
|
|
|
+
|
|
|
|
+ System.out.println(medind.getRule() + " -> " + medind.getName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|