|
|
@@ -8,13 +8,24 @@ import com.diagbot.dto.WordCrfDTO;
|
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
|
import com.diagbot.model.ai.AIAnalyze;
|
|
|
import com.diagbot.model.entity.PacsNew;
|
|
|
-import com.diagbot.model.label.*;
|
|
|
+import com.diagbot.model.label.ChiefLabel;
|
|
|
+import com.diagbot.model.label.DiagLabel;
|
|
|
+import com.diagbot.model.label.PastLabel;
|
|
|
+import com.diagbot.model.label.PresentLabel;
|
|
|
+import com.diagbot.model.label.VitalLabel;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.vo.NeoPushVO;
|
|
|
import com.diagbot.vo.SearchData;
|
|
|
import com.diagbot.vo.StandConvert;
|
|
|
-import com.diagbot.vo.neoPushEntity.*;
|
|
|
+import com.diagbot.vo.neoPushEntity.ChiefPushVo;
|
|
|
+import com.diagbot.vo.neoPushEntity.Diag;
|
|
|
+import com.diagbot.vo.neoPushEntity.DiagVo;
|
|
|
+import com.diagbot.vo.neoPushEntity.Drug;
|
|
|
+import com.diagbot.vo.neoPushEntity.LisPushVo;
|
|
|
+import com.diagbot.vo.neoPushEntity.PacsPushVo;
|
|
|
+import com.diagbot.vo.neoPushEntity.PresentPushVo;
|
|
|
+import com.diagbot.vo.neoPushEntity.Symptom;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
@@ -95,9 +106,7 @@ public class CommonFacade {
|
|
|
|
|
|
//所有辅助检查(结构化数据)
|
|
|
List<String> allPacs = new ArrayList<>();
|
|
|
-// List<Pacs> pacs = wordCrfDTO.getPacs();
|
|
|
List<PacsNew> pacsNews = wordCrfDTO.getPacsLabel().getPacsNewList();
|
|
|
-// List<com.diagbot.model.entity.Pacs> pacses = wordCrfDTO.getPacsLabel().getPacses();
|
|
|
if (ListUtil.isNotEmpty(pacsNews)) {
|
|
|
List<String> pacss_unique = pacsNews.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
|
|
|
.map(x -> x.getName()).collect(Collectors.toList());
|
|
|
@@ -144,9 +153,7 @@ public class CommonFacade {
|
|
|
PastLabel pastLabel = wordCrfDTO.getPastLabel();
|
|
|
DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
|
|
|
List<Lis> lis = wordCrfDTO.getLis();
|
|
|
-// List<Pacs> pacs = wordCrfDTO.getPacs();
|
|
|
List<PacsNew> pacsNews = wordCrfDTO.getPacsLabel().getPacsNewList();
|
|
|
-// List<com.diagbot.model.entity.Pacs> pacses = wordCrfDTO.getPacsLabel().getPacses();
|
|
|
VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
|
|
|
|
|
|
//症状回填
|
zhoutg