|
|
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.diagbot.client.AiptServiceClient;
|
|
|
import com.diagbot.client.BigDataServiceClient;
|
|
|
-import com.diagbot.client.GraphServiceClient;
|
|
|
import com.diagbot.client.TranServiceClient;
|
|
|
import com.diagbot.client.bean.FeatureRate;
|
|
|
import com.diagbot.client.bean.GdbResponse;
|
|
|
@@ -30,9 +29,15 @@ import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.FastJsonUtils;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
-import com.diagbot.vo.*;
|
|
|
+import com.diagbot.vo.EMRPushVO;
|
|
|
+import com.diagbot.vo.HosCodeVO;
|
|
|
+import com.diagbot.vo.LisKYJVO;
|
|
|
+import com.diagbot.vo.LisResult;
|
|
|
+import com.diagbot.vo.LisResultVO;
|
|
|
+import com.diagbot.vo.PushKYJVO;
|
|
|
+import com.diagbot.vo.PushVO;
|
|
|
+import com.diagbot.vo.QuestionVO;
|
|
|
import com.google.common.collect.Lists;
|
|
|
-import io.micrometer.core.instrument.search.Search;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
@@ -474,7 +479,7 @@ public class PushFacade {
|
|
|
questionVO.setSexType(pushVO.getSex());
|
|
|
questionVO.setId(deptVital.getVitalId());
|
|
|
QuestionDTO questionDTO = questionFacade.getById(questionVO);
|
|
|
- if (questionDTO != null) {
|
|
|
+ if (questionDTO != null && questionDTO.getId() != null) {
|
|
|
vitalDTO.add(questionDTO);
|
|
|
}
|
|
|
}
|
Zhaops