Browse Source

既往诊断去重

zhoutg 4 years ago
parent
commit
6c21d7f96c
1 changed files with 5 additions and 2 deletions
  1. 5 2
      src/main/java/com/diagbot/facade/PushFacade.java

+ 5 - 2
src/main/java/com/diagbot/facade/PushFacade.java

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