代码结构调整

aipt-service/src/main/java/com/diagbot/aggregate/SearchItemAggregate.java

@@ -3,7 +3,7 @@ package com.diagbot.aggregate;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.facade.TransferFacade;
 import com.diagbot.util.ListUtil;

aipt-service/src/main/java/com/diagbot/aggregate/TreatmentAggregate.java

@@ -1,7 +1,7 @@
 package com.diagbot.aggregate;
 
 import com.diagbot.biz.push.entity.AdverseReaction;
-import com.diagbot.biz.push.entity.ConceptDetailDTO;
+import com.diagbot.biz.push.dto.ConceptDetailDTO;
 import com.diagbot.biz.push.entity.Medicition;
 import com.diagbot.biz.push.entity.MedicitionClass;
 import com.diagbot.biz.push.entity.MeditionDetail;

aipt-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.util.BeanUtil;
 import org.springframework.stereotype.Component;

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -2,7 +2,7 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.Response;

aipt-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.service.impl.EvaluationServiceImpl;
 import com.diagbot.util.BeanUtil;

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -3,7 +3,7 @@ package com.diagbot.facade;
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.entity.Treat;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.dto.PushDTO;

aipt-service/src/main/java/com/diagbot/vo/EvaluationDiseaseNameVO.java

@@ -1,6 +1,6 @@
 package com.diagbot.vo;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 

aipt-service/src/main/java/com/diagbot/web/ClinicalController.java

@@ -3,7 +3,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;

aipt-service/src/main/java/com/diagbot/web/EvaluationController.java

@@ -1,7 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationFacade;

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,7 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;

common/src/main/java/com/diagbot/biz/push/entity/ConceptDetailDTO.java

@@ -1,4 +1,4 @@
-package com.diagbot.biz.push.entity;
+package com.diagbot.biz.push.dto;
 
 import lombok.Getter;
 import lombok.Setter;

common/src/main/java/com/diagbot/biz/push/entity/Treat.java

@@ -1,5 +1,6 @@
 package com.diagbot.biz.push.entity;
 
+import com.diagbot.biz.push.dto.ConceptDetailDTO;
 import lombok.Getter;
 import lombok.Setter;
 

common/src/main/java/com/diagbot/biz/push/entity/SearchVO.java

@@ -1,5 +1,6 @@
-package com.diagbot.biz.push.entity;
+package com.diagbot.biz.push.vo;
 
+import com.diagbot.biz.push.entity.SearchBaseData;
 import lombok.Getter;
 import lombok.Setter;
 

data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,6 +1,6 @@
 package com.diagbot.client;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.hystrix.AiptServiceHystrix;

data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.PushVO;

data-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ScaleContent;

data-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,6 +1,6 @@
 package com.diagbot.vo;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,6 +1,6 @@
 package com.diagbot.client;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;

icss-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.PushVO;

icss-service/src/main/java/com/diagbot/facade/EvaluationModuleMappingFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.PushDTO;

icss-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ScaleIndexDTO;

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,6 +1,6 @@
 package com.diagbot.vo;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 

ltapi-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,6 +1,6 @@
 package com.diagbot.client;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.hystrix.AiptServiceHystrix;

ltapi-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;

ltapi-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;

ltapi-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ScaleContent;

ltapi-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,6 +1,6 @@
 package com.diagbot.vo;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 

prec-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,6 +1,6 @@
 package com.diagbot.client;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;

prec-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,6 +1,6 @@
 package com.diagbot.client.hystrix;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;

prec-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.PushVO;

prec-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptPushDTO;

triage-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -1,7 +1,7 @@
 package com.diagbot.client;
 
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;

triage-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,7 +1,7 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;

triage-service/src/main/java/com/diagbot/facade/AIFacade.java

@@ -2,7 +2,7 @@ package com.diagbot.facade;
 
 import com.diagbot.biz.push.entity.FeatureRate;
 import com.diagbot.biz.push.entity.ResponseData;
-import com.diagbot.biz.push.entity.SearchVO;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.AIDTO;