|
@@ -50,12 +50,17 @@ public class BEH0030 extends QCCatalogue {
|
|
|
}
|
|
|
String pastText = pastLabel.getText();
|
|
|
String familyText = familyLabel.getText();
|
|
|
- if (pastText.contains("肝炎") || pastText.contains("结核") || pastText.contains("详见原病历")
|
|
|
- || pastText.contains("乙肝") || pastText.contains("传染病史")) {
|
|
|
+ String pastText1=structureMap.get("既往史");
|
|
|
+ if (pastText!=null && (pastText.contains("肝炎") || pastText.contains("结核") || pastText.contains("详见原病历")
|
|
|
+ || pastText.contains("乙肝") || pastText.contains("传染病史"))) {
|
|
|
status.set("0");
|
|
|
}
|
|
|
- if (familyText.contains("肝炎") || familyText.contains("结核") || familyText.contains("详见原病历")
|
|
|
- || familyText.contains("乙肝")) {
|
|
|
+ if (familyText!=null && (familyText.contains("肝炎") || familyText.contains("结核") || familyText.contains("详见原病历")
|
|
|
+ || familyText.contains("乙肝"))) {
|
|
|
+ status.set("0");
|
|
|
+ }
|
|
|
+ if (pastText1!=null && (pastText1.contains("肝炎") || pastText1.contains("结核") || pastText1.contains("详见原病历")
|
|
|
+ || pastText1.contains("乙肝") || pastText1.contains("传染病史"))) {
|
|
|
status.set("0");
|
|
|
}
|
|
|
}
|