|
@@ -8,7 +8,6 @@ import com.diagbot.dto.PushPlanDTO;
|
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
|
import com.diagbot.enums.DiagnoseTypeEnum;
|
|
|
import com.diagbot.enums.DiseasePushTypeEnum;
|
|
|
-import com.diagbot.enums.DiseaseTypeEnum;
|
|
|
import com.diagbot.enums.RedisEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -191,20 +190,22 @@ public class PushFacade {
|
|
|
// 去重
|
|
|
CoreUtil.removeByRepeatProperty(possibleUnion, "name");
|
|
|
}
|
|
|
- // 获取既往史否定诊断
|
|
|
- List<String> negativeDis = CoreUtil.getPropertyWithFilter(wordCrfDTO.getPastLabel().getDiags(),
|
|
|
- "standName", "negative");
|
|
|
- if (ListUtil.isNotEmpty(negativeDis)) { // 添加既往史否定诊断
|
|
|
- pushDTO.getDis().put("既往史否定诊断", pushProcess.generatePushBaseDTO(negativeDis, -1));
|
|
|
- // 可能诊断——剔除既往否定诊断
|
|
|
- filterDisease(dis.get(DiagnoseTypeEnum.possibleUnion.getName()), negativeDis);
|
|
|
- // 鉴别诊断——剔除既往否定诊断
|
|
|
- filterDisease(dis.get(DiseaseTypeEnum.identify.getName()), negativeDis);
|
|
|
- // 警惕——剔除既往否定诊断
|
|
|
- filterDisease(dis.get(DiagnoseTypeEnum.vigilant.getName()), negativeDis);
|
|
|
- }
|
|
|
+ // // 获取既往史否定诊断
|
|
|
+ // List<String> negativeDis = CoreUtil.getPropertyWithFilter(wordCrfDTO.getPastLabel().getDiags(),
|
|
|
+ // "standName", "negative");
|
|
|
+ // if (ListUtil.isNotEmpty(negativeDis)) { // 添加既往史否定诊断
|
|
|
+ // pushDTO.getDis().put("既往史否定诊断", pushProcess.generatePushBaseDTO(negativeDis, -1));
|
|
|
+ // // 可能诊断——剔除既往否定诊断
|
|
|
+ // filterDisease(dis.get(DiagnoseTypeEnum.possibleUnion.getName()), negativeDis);
|
|
|
+ // // 鉴别诊断——剔除既往否定诊断
|
|
|
+ // filterDisease(dis.get(DiseaseTypeEnum.identify.getName()), negativeDis);
|
|
|
+ // // 警惕——剔除既往否定诊断
|
|
|
+ // filterDisease(dis.get(DiagnoseTypeEnum.vigilant.getName()), negativeDis);
|
|
|
+ // }
|
|
|
// 可能诊断根据长度截取
|
|
|
- possibleUnion = possibleUnion.size() > length ? possibleUnion.subList(0, length) : possibleUnion;
|
|
|
+ if (ListUtil.isNotEmpty(possibleUnion)) {
|
|
|
+ possibleUnion = possibleUnion.size() > length ? possibleUnion.subList(0, length) : possibleUnion;
|
|
|
+ }
|
|
|
// 添加可能诊断
|
|
|
dis.put(DiagnoseTypeEnum.possibleUnion.getName(), possibleUnion);
|
|
|
}
|