|
@@ -38,6 +38,7 @@ public class StructureAnalyze {
|
|
|
private static String current_diag = "";
|
|
|
private static BodyPart bodyPart = null;
|
|
|
private static Negative negative = null;
|
|
|
+ private static String direct = "";
|
|
|
private static String num = "";
|
|
|
private static String pacs_content = "";
|
|
|
private static List<String> diag_con = Arrays.asList("门诊","诊断","入院","拟");
|
|
@@ -121,6 +122,9 @@ public class StructureAnalyze {
|
|
|
}
|
|
|
|
|
|
bodyPart = null;
|
|
|
+ direct = "";
|
|
|
+ negative = null;
|
|
|
+
|
|
|
if (pacs_content.length() > 0) {
|
|
|
current = outputInfo.getPacses().get(outputInfo.getPacses().size()-1);
|
|
|
String[] arr = pacs_content.split(colon);
|
|
@@ -288,11 +292,14 @@ public class StructureAnalyze {
|
|
|
((Symptom)current).getPds().add(pd);
|
|
|
updated = true;
|
|
|
}
|
|
|
+ else {
|
|
|
+ direct = lexeme.getText();
|
|
|
+ }
|
|
|
break;
|
|
|
case Constants.word_property_neg:
|
|
|
negative = new Negative();
|
|
|
negative.setNegaName(lexeme.getText());
|
|
|
-// symptom.setNegative(negative);
|
|
|
+
|
|
|
updated = true;
|
|
|
break;
|
|
|
case Constants.word_property_timestamp:
|
|
@@ -509,6 +516,17 @@ public class StructureAnalyze {
|
|
|
negative = null;
|
|
|
}
|
|
|
|
|
|
+ if (direct.length() > 0) {
|
|
|
+ if (symptom.getPds() == null) {
|
|
|
+ symptom.setPds(new ArrayList());
|
|
|
+ symptom.getPds().add(new PD());
|
|
|
+ }
|
|
|
+ PD pd = symptom.getPds().get(symptom.getPds().size()-1);
|
|
|
+ pd.setValue(direct);
|
|
|
+ pd.setUnit("");
|
|
|
+ direct = "";
|
|
|
+ }
|
|
|
+
|
|
|
obj = symptom;
|
|
|
break;
|
|
|
case Constants.word_property_vital_idx:
|
|
@@ -619,12 +637,7 @@ public class StructureAnalyze {
|
|
|
negative = null;
|
|
|
}
|
|
|
|
|
|
-// if (current instanceof Symptom) {
|
|
|
-// symptom = (Symptom)current;
|
|
|
-// }
|
|
|
-// else {
|
|
|
- symptom = outputInfo.getSymptoms().get(outputInfo.getSymptoms().size() - 1);
|
|
|
-// }
|
|
|
+ symptom = outputInfo.getSymptoms().get(outputInfo.getSymptoms().size() - 1);
|
|
|
|
|
|
if (symptom.getProperty() != null) {
|
|
|
if (!outputInfo.getSymptoms().get(outputInfo.getSymptoms().size() - 1).getSymptomName().equals(symptom.getSymptomName())) {
|