|
@@ -26,6 +26,7 @@ public class PretreatmentRule {
|
|
|
//症状规则 主诉、现病史提取
|
|
|
if (!StringUtils.isEmpty(searchData.getChief())) {
|
|
|
searchData.setChief(add2PreResultList(new PretreatmentSymptom(), searchData.getChief(), "symptom", searchData));
|
|
|
+ add2PreResultList(new PretreatmentOther(), searchData.getChief(), "other", searchData); //其他
|
|
|
}
|
|
|
//现病史 提取手术史和过敏史
|
|
|
if (!StringUtils.isEmpty(searchData.getSymptom())) {
|
|
@@ -34,7 +35,9 @@ public class PretreatmentRule {
|
|
|
add2PreResultList(new PretreatmentSymptom(), searchData.getSymptom(), "symptom", searchData); //症状
|
|
|
add2PreResultList(new PretreatmentInfectious(), searchData.getSymptom(), "infectious", searchData); //传染病史
|
|
|
add2PreResultList(new PretreatmentPacs(), searchData.getSymptom(), "pacs", searchData); //检查
|
|
|
+ add2PreResultList(new PretreatmentOther(), searchData.getSymptom(), "other", searchData); //其他
|
|
|
}
|
|
|
+
|
|
|
//体征数据 体征、现病史提取
|
|
|
if (!StringUtils.isEmpty(searchData.getVital())) {
|
|
|
searchData.setVital(add2PreResultList(new PretreatmentVital(), searchData.getVital(), "vital", searchData));
|
|
@@ -95,6 +98,10 @@ public class PretreatmentRule {
|
|
|
if (!StringUtils.isEmpty(searchData.getVaccination())) {
|
|
|
add2PreResultList(new PretreatmentVaccination(), searchData.getVaccination(), "vaccination", searchData);
|
|
|
}
|
|
|
+ //月经史
|
|
|
+ if (!StringUtils.isEmpty(searchData.getMenstrual())){
|
|
|
+ add2PreResultList(new PretreatmentOther(), searchData.getMenstrual(), "other", searchData);
|
|
|
+ }
|
|
|
//其他史
|
|
|
if (!StringUtils.isEmpty(searchData.getOther())) {
|
|
|
add2PreResultList(new PretreatmentPast(), searchData.getOther(), "pasts", searchData);
|
|
@@ -107,6 +114,8 @@ public class PretreatmentRule {
|
|
|
add2PreResultList(new PretreatmentVaccination(), searchData.getOther(), "vaccination", searchData);
|
|
|
add2PreResultList(new PretreatmentDrug(), searchData.getOther(), "drug", searchData);
|
|
|
add2PreResultList(new PretreatmentDiag(), searchData.getOther(), "diag", searchData);
|
|
|
+ add2PreResultList(new PretreatmentOther(), searchData.getOther(), "other", searchData); //其他
|
|
|
+
|
|
|
}
|
|
|
//lis结构化信息
|
|
|
if (searchData.getLis() != null && searchData.getLis().size() > 0) {
|