|
@@ -1,14 +1,19 @@
|
|
package com.diagbot.facade;
|
|
package com.diagbot.facade;
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.extension.api.R;
|
|
|
|
+import com.diagbot.biz.push.entity.Lis;
|
|
import com.diagbot.client.StandConvertServiceClient;
|
|
import com.diagbot.client.StandConvertServiceClient;
|
|
import com.diagbot.dto.IndicationDTO;
|
|
import com.diagbot.dto.IndicationDTO;
|
|
|
|
+import com.diagbot.dto.RegularValueDTO;
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
|
|
+import com.diagbot.enums.RegularConfigEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.rule.CommonRule;
|
|
import com.diagbot.rule.CommonRule;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.vo.IndicationPushVO;
|
|
import com.diagbot.vo.IndicationPushVO;
|
|
|
|
+import com.diagbot.vo.RegularConfigDataVO;
|
|
import com.diagbot.vo.StandConvert;
|
|
import com.diagbot.vo.StandConvert;
|
|
import io.github.lvyahui8.spring.facade.DataFacade;
|
|
import io.github.lvyahui8.spring.facade.DataFacade;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -39,6 +44,8 @@ public class IndicationFacade {
|
|
StandConvertServiceClient standConvertServiceClient;
|
|
StandConvertServiceClient standConvertServiceClient;
|
|
@Autowired
|
|
@Autowired
|
|
CommonRule commonRule;
|
|
CommonRule commonRule;
|
|
|
|
+ @Autowired
|
|
|
|
+ SysRegularConfigFacade sysRegularConfigFacade;
|
|
|
|
|
|
private static final Map<String, List<String>> methodMap;
|
|
private static final Map<String, List<String>> methodMap;
|
|
|
|
|
|
@@ -85,7 +92,24 @@ public class IndicationFacade {
|
|
wordCrfDTO = commonFacade.crf_process(indicationPushVO);
|
|
wordCrfDTO = commonFacade.crf_process(indicationPushVO);
|
|
}
|
|
}
|
|
CoreUtil.getDebugStr(crfStart, "模型处理耗时", debug);
|
|
CoreUtil.getDebugStr(crfStart, "模型处理耗时", debug);
|
|
-
|
|
|
|
|
|
+ //正则匹配
|
|
|
|
+ String symptom = wordCrfDTO.getSymptom();
|
|
|
|
+ RegularConfigDataVO regularConfigData= new RegularConfigDataVO();
|
|
|
|
+ regularConfigData.setText(symptom);
|
|
|
|
+ List<RegularValueDTO> regularConfigDatas = sysRegularConfigFacade.getRegularConfigDatas(regularConfigData);
|
|
|
|
+ List<Lis> lisData = wordCrfDTO.getLis();
|
|
|
|
+ if(ListUtil.isNotEmpty(regularConfigDatas)){
|
|
|
|
+ for(RegularValueDTO data:regularConfigDatas){
|
|
|
|
+ if(data.getType().equals(RegularConfigEnum.lis.getKey())){
|
|
|
|
+ Lis lis = new Lis();
|
|
|
|
+ lis.setUniqueName(data.getKey());
|
|
|
|
+ lis.setName(data.getKey());
|
|
|
|
+ lis.setValue(Double.valueOf(data.getValue()));
|
|
|
|
+ lisData.add(lis);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ wordCrfDTO.setLis(lisData);
|
|
// 标准词转换
|
|
// 标准词转换
|
|
long standStart = System.currentTimeMillis();
|
|
long standStart = System.currentTimeMillis();
|
|
if (methodList.contains("stand")) {
|
|
if (methodList.contains("stand")) {
|