|
@@ -170,13 +170,16 @@ public class PushFacade {
|
|
|
|
|
|
// 添加既往诊断,不参与业务
|
|
|
List<Diag> diagList = wordCrfDTO.getPastLabel().getDiags();
|
|
|
+ List<String> pastDiagList = Lists.newArrayList();
|
|
|
if (ListUtil.isNotEmpty(diagList)) {
|
|
|
List<PushBaseDTO> pushBaseDTOList = Lists.newArrayList();
|
|
|
for (Diag diag : diagList) {
|
|
|
- if (diag.getNegative() == null) {
|
|
|
+ String diagName = diag.getName();
|
|
|
+ if (diag.getNegative() == null && !pastDiagList.contains(diagName)) {
|
|
|
PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
- pushBaseDTO.setName(diag.getName());
|
|
|
+ pushBaseDTO.setName(diagName);
|
|
|
pushBaseDTOList.add(pushBaseDTO);
|
|
|
+ pastDiagList.add(diagName);
|
|
|
}
|
|
|
}
|
|
|
pushDTO.getDis().put(DiagnoseTypeEnum.pastDisease.getName(), pushBaseDTOList);
|