|
@@ -11,6 +11,7 @@ import com.diagbot.enums.DiseasePushTypeEnum;
|
|
import com.diagbot.enums.RedisEnum;
|
|
import com.diagbot.enums.RedisEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
|
|
+import com.diagbot.model.entity.Diag;
|
|
import com.diagbot.process.PushProcess;
|
|
import com.diagbot.process.PushProcess;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
@@ -162,6 +163,21 @@ public class PushFacade {
|
|
CoreUtil.getDebugStr(start, "总计耗时", debug);
|
|
CoreUtil.getDebugStr(start, "总计耗时", debug);
|
|
CoreUtil.getDebugObject("数据", debug, wordCrfDTO);
|
|
CoreUtil.getDebugObject("数据", debug, wordCrfDTO);
|
|
pushDTO.getDebug().putAll(debug);
|
|
pushDTO.getDebug().putAll(debug);
|
|
|
|
+
|
|
|
|
+ // 添加既往诊断,不参与业务
|
|
|
|
+ List<Diag> diagList = wordCrfDTO.getPastLabel().getDiags();
|
|
|
|
+ if (ListUtil.isNotEmpty(diagList)) {
|
|
|
|
+ List<PushBaseDTO> pushBaseDTOList = Lists.newArrayList();
|
|
|
|
+ for (Diag diag : diagList) {
|
|
|
|
+ if (diag.getNegative() == null) {
|
|
|
|
+ PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
|
+ pushBaseDTO.setName(diag.getName());
|
|
|
|
+ pushBaseDTOList.add(pushBaseDTO);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ pushDTO.getDis().put(DiagnoseTypeEnum.pastDisease.getName(), pushBaseDTOList);
|
|
|
|
+ }
|
|
|
|
+
|
|
return pushDTO;
|
|
return pushDTO;
|
|
}
|
|
}
|
|
|
|
|