|
@@ -5,6 +5,7 @@ import com.diagbot.dto.WordCrfDTO;
|
|
|
import com.diagbot.facade.BillFacade;
|
|
|
import com.diagbot.facade.CriticalFacade;
|
|
|
import com.diagbot.facade.HighRiskFacade;
|
|
|
+import com.diagbot.facade.OtherTipFacade;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.IndicationPushVO;
|
|
@@ -32,6 +33,8 @@ public class IndicationAggregate {
|
|
|
HighRiskFacade highRiskFacade;
|
|
|
@Autowired
|
|
|
CriticalFacade criticalFacade;
|
|
|
+ @Autowired
|
|
|
+ OtherTipFacade otherTipFacade;
|
|
|
|
|
|
@DataProvider("indicationAll")
|
|
|
public IndicationDTO indicationAll(
|
|
@@ -40,7 +43,8 @@ public class IndicationAggregate {
|
|
|
@InvokeParameter("debug") Map<String, Object> debug,
|
|
|
@DataConsumer("bill") IndicationDTO billDTO,
|
|
|
@DataConsumer("highrisk") IndicationDTO highriskDTO,
|
|
|
- @DataConsumer("critical") IndicationDTO criticalDTO) {
|
|
|
+ @DataConsumer("critical") IndicationDTO criticalDTO,
|
|
|
+ @DataConsumer("otherTip") IndicationDTO otherDTO) {
|
|
|
IndicationDTO res = new IndicationDTO();
|
|
|
if (billDTO != null) {
|
|
|
res.setBillMsgList(billDTO.getBillMsgList());
|
|
@@ -54,6 +58,10 @@ public class IndicationAggregate {
|
|
|
res.setCriticalValList(criticalDTO.getCriticalValList());
|
|
|
debug.putAll(criticalDTO.getDebug()); // 调试信息
|
|
|
}
|
|
|
+ if (otherDTO != null) {
|
|
|
+ res.setOtherList(otherDTO.getOtherList());
|
|
|
+ debug.putAll(otherDTO.getDebug()); // 调试信息
|
|
|
+ }
|
|
|
res.setDebug(debug);
|
|
|
return res;
|
|
|
}
|
|
@@ -137,4 +145,30 @@ public class IndicationAggregate {
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 其他提示
|
|
|
+ *
|
|
|
+ * @param wordCrfDTO
|
|
|
+ * @param indicationPushVO
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DataProvider("otherTip")
|
|
|
+ public IndicationDTO otherTip(@InvokeParameter("wordCrfDTO") WordCrfDTO wordCrfDTO,
|
|
|
+ @InvokeParameter("indicationPushVO") IndicationPushVO indicationPushVO) {
|
|
|
+ long start = System.currentTimeMillis();
|
|
|
+ IndicationDTO res = new IndicationDTO();
|
|
|
+ // 其他提示
|
|
|
+ if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("4")) {
|
|
|
+ try {
|
|
|
+ otherTipFacade.otherTipFac(indicationPushVO, wordCrfDTO, res);
|
|
|
+ CoreUtil.getDebugStr(start, "其他值提示耗时", res.getDebug());
|
|
|
+ return res;
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("【其他值提示出错】" + e.getMessage());
|
|
|
+ CoreUtil.getDebugStr("【其他值提示出错】", e.getMessage(), res.getDebug());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|