|
@@ -73,6 +73,22 @@ public class CommonFacade {
|
|
//组装好的label
|
|
//组装好的label
|
|
public WordCrfDTO crf_process(SearchData searchData) {
|
|
public WordCrfDTO crf_process(SearchData searchData) {
|
|
AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient);
|
|
AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient);
|
|
|
|
+ // 合并既往史:既往史+传染病史+手术外伤史+过敏史+接种史
|
|
|
|
+ String unionPasts = searchData.getPasts();
|
|
|
|
+ if (StringUtil.isNotBlank(searchData.getInfectious())) { // 传染病史
|
|
|
|
+ unionPasts = unionPasts + "。" + searchData.getInfectious();
|
|
|
|
+ }
|
|
|
|
+ if (StringUtil.isNotBlank(searchData.getSurgical())) { // 手术外伤史
|
|
|
|
+ unionPasts = unionPasts + "。" + searchData.getSurgical();
|
|
|
|
+ }
|
|
|
|
+ if (StringUtil.isNotBlank(searchData.getAllergy())) { // 过敏史
|
|
|
|
+ unionPasts = unionPasts + "。" + searchData.getAllergy();
|
|
|
|
+ }
|
|
|
|
+ if (StringUtil.isNotBlank(searchData.getVaccination())) { // 接种史
|
|
|
|
+ unionPasts = unionPasts + "。" + searchData.getVaccination();
|
|
|
|
+ }
|
|
|
|
+ searchData.setPasts(unionPasts);
|
|
|
|
+
|
|
WordCrfDTO wordCrfDTO = new WordCrfDTO();
|
|
WordCrfDTO wordCrfDTO = new WordCrfDTO();
|
|
wordCrfDTO.setHospitalId(searchData.getHospitalId());
|
|
wordCrfDTO.setHospitalId(searchData.getHospitalId());
|
|
// 年龄容错处理
|
|
// 年龄容错处理
|
|
@@ -129,8 +145,8 @@ public class CommonFacade {
|
|
if (StringUtil.isNotBlank(searchData.getChief())) {
|
|
if (StringUtil.isNotBlank(searchData.getChief())) {
|
|
wordCrfDTO.setChief(searchData.getChief());
|
|
wordCrfDTO.setChief(searchData.getChief());
|
|
}
|
|
}
|
|
- if (StringUtil.isNotBlank(searchData.getPasts())) {
|
|
|
|
- wordCrfDTO.setPasts(searchData.getPasts());
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(unionPasts)) {
|
|
|
|
+ wordCrfDTO.setPasts(unionPasts);
|
|
}
|
|
}
|
|
if (StringUtil.isNotBlank(searchData.getMenstrual())) {
|
|
if (StringUtil.isNotBlank(searchData.getMenstrual())) {
|
|
wordCrfDTO.setMenstrual(searchData.getMenstrual());
|
|
wordCrfDTO.setMenstrual(searchData.getMenstrual());
|