|
@@ -7,6 +7,7 @@ import com.diagbot.dto.PushPlanDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.entity.TranDatadockingLog;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
+import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -68,14 +69,35 @@ public class DataPageDockFacade {
|
|
|
}
|
|
|
|
|
|
String url="";
|
|
|
+ String pushMrId="";
|
|
|
PushJoinVO pushJoinVO = new PushJoinVO();
|
|
|
BeanUtil.copyProperties(dataPageDockVO, pushJoinVO);
|
|
|
// 将基本参数保存到redis
|
|
|
String mrId = mrFacade.createMr(pushJoinVO);
|
|
|
+ //开单合理性推理时,验证下是否有推送,无推送时,不给url,code为“-1”
|
|
|
+ if(dataPageDockVO.getPlanCode().equals("order_rational")){
|
|
|
+ IndicationPushVO indicationPushVO=new IndicationPushVO();
|
|
|
+ //初始化开单合理性入参
|
|
|
+ BeanUtil.copyProperties(dataPageDockVO,indicationPushVO);
|
|
|
+ indicationPushVO.setRuleType("1,2,3,4");
|
|
|
+ IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
|
|
|
+ if (indicationDTO != null) {
|
|
|
+ if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList()) || ListUtil.isNotEmpty(indicationDTO.getHighRiskList())
|
|
|
+ || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList()))
|
|
|
+ {
|
|
|
+ pushMrId= mrFacade.createIndicationMr(indicationDTO);
|
|
|
+ }else{
|
|
|
+ return RespDTO.onError("无开单合理性提醒!");
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ return RespDTO.onError("无开单合理性提醒!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if("hor".equals(dataPageDockVO.getShowType())){
|
|
|
- url=dataPageUrl+"/cdssHorizontal.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
|
|
|
+ url=dataPageUrl+"/cdssHorizontal.html?pushMrId='"+pushMrId+"'&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
|
|
|
}else{
|
|
|
- url=dataPageUrl+"/cdss.html?mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
|
|
|
+ url=dataPageUrl+"/cdss.html?pushMrId='"+pushMrId+"'&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
|
|
|
}
|
|
|
|
|
|
try{
|