日志，不管有无合理性都打印

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -43,32 +43,32 @@ public class DataPageDockFacade {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO<String> getStaticKnowledge(HisStaticKnowledgeVO hisStaticKnowledgeVO){
-        if(StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalCode()) && StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalName())){
+    public RespDTO<String> getStaticKnowledge(HisStaticKnowledgeVO hisStaticKnowledgeVO) {
+        if (StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalCode()) && StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalName())) {
             //查找基层医院术语，等新表构建后编写业务
             hisStaticKnowledgeVO.setHospitalId(null);
-        }else if(hisStaticKnowledgeVO.getHospitalId()==null){
-             return RespDTO.onError("请输入医院id");
+        } else if (hisStaticKnowledgeVO.getHospitalId() == null) {
+            return RespDTO.onError("请输入医院id");
         }
 
-        String url=dataPageUrl+"/informationOut.html?hospitalId="+hisStaticKnowledgeVO.getHospitalId()
-                +"&type="+hisStaticKnowledgeVO.getType()
-                +"&hisName="+hisStaticKnowledgeVO.getHisName();
-        if(StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHisDetailName())){
-            url+="&hisDetailName="+hisStaticKnowledgeVO.getHisDetailName();
+        String url = dataPageUrl + "/informationOut.html?hospitalId=" + hisStaticKnowledgeVO.getHospitalId()
+                + "&type=" + hisStaticKnowledgeVO.getType()
+                + "&hisName=" + hisStaticKnowledgeVO.getHisName();
+        if (StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHisDetailName())) {
+            url += "&hisDetailName=" + hisStaticKnowledgeVO.getHisDetailName();
         }
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(hisStaticKnowledgeVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(hisStaticKnowledgeVO));
             tranDatadockingLog.setParamOut(url);
-            tranDatadockingLog.setRemark("页面推送模式，静态知识:"+hisStaticKnowledgeVO.getType());
+            tranDatadockingLog.setRemark("页面推送模式，静态知识:" + hisStaticKnowledgeVO.getType());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("页面推送模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("页面推送模式，增加日志异常", e.getMessage());
         }
         return RespDTO.onSuc(url);
     }
@@ -80,62 +80,90 @@ public class DataPageDockFacade {
      **/
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
-        if(StringUtil.isNotEmpty(dataPageDockVO.getHospitalCode()) && StringUtil.isNotEmpty(dataPageDockVO.getHospitalName())){
+        if (StringUtil.isNotEmpty(dataPageDockVO.getHospitalCode()) && StringUtil.isNotEmpty(dataPageDockVO.getHospitalName())) {
             //查找基层医院术语，等新表构建后编写业务
             dataPageDockVO.setHospitalId(null);
-        }if(dataPageDockVO.getHospitalId()==null){
+        }
+        if (dataPageDockVO.getHospitalId() == null) {
             return RespDTO.onError("请输入医院id");
-        }else if("".equals(dataPageDockVO.getShowType())){
+        } else if ("".equals(dataPageDockVO.getShowType())) {
             return RespDTO.onError("请输入展示类型,横版：ver，或竖版hor");
-        }else if("".equals(dataPageDockVO.getPlanCode())){
+        } else if ("".equals(dataPageDockVO.getPlanCode())) {
             return RespDTO.onError("请输入方案编码");
         }
 
-        String url="";
-        String pushMrId="";
+        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") || dataPageDockVO.getPlanCode().equals("reference_pacs") || dataPageDockVO.getPlanCode().equals("reference_lis")){
-            IndicationPushVO indicationPushVO=new IndicationPushVO();
+        if (dataPageDockVO.getPlanCode().equals("order_rational") || dataPageDockVO.getPlanCode().equals("reference_pacs") || dataPageDockVO.getPlanCode().equals("reference_lis")) {
+            IndicationPushVO indicationPushVO = new IndicationPushVO();
             //初始化开单合理性入参
-            BeanUtil.copyProperties(dataPageDockVO,indicationPushVO);
+            BeanUtil.copyProperties(dataPageDockVO, indicationPushVO);
             //ruleType（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:其他提醒）
             indicationPushVO.setRuleType("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{
+                        || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList())) {
+                    pushMrId = mrFacade.createIndicationMr(indicationDTO);
+                } else {
+                    try {
+                        url = "提示信息出参为空";
+                        TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
+                        tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
+                        tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockVO));
+                        tranDatadockingLog.setParamOut(url);
+                        tranDatadockingLog.setRemark("页面推送模式，" + dataPageDockVO.getPlanCode());
+
+                        tranDatadockingLog.setTransTime(new Date());
+
+                        dataDockingLogFacade.save(tranDatadockingLog);
+                    } catch (Exception e) {
+                        log.error("页面推送模式，增加日志异常", e.getMessage());
+                    }
                     return RespDTO.onError("无开单合理性提醒！");
                 }
-            }else{
+            } else {
+                try {
+                    url = "提示信息出参全为空";
+                    TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
+                    tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
+                    tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockVO));
+                    tranDatadockingLog.setParamOut(url);
+                    tranDatadockingLog.setRemark("页面推送模式，" + dataPageDockVO.getPlanCode());
+
+                    tranDatadockingLog.setTransTime(new Date());
+
+                    dataDockingLogFacade.save(tranDatadockingLog);
+                } catch (Exception e) {
+                    log.error("页面推送模式，增加日志异常", e.getMessage());
+                }
                 return RespDTO.onError("无开单合理性提醒！");
             }
         }
 
-        if("hor".equals(dataPageDockVO.getShowType())){
-            url=dataPageUrl+"/cdssHorizontal.html?pushMrId="+pushMrId+"&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
-        }else{
-            url=dataPageUrl+"/cdss.html?pushMrId="+pushMrId+"&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
+        if ("hor".equals(dataPageDockVO.getShowType())) {
+            url = dataPageUrl + "/cdssHorizontal.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
+        } else {
+            url = dataPageUrl + "/cdss.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
         }
 
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockVO));
             tranDatadockingLog.setParamOut(url);
-            tranDatadockingLog.setRemark("页面推送模式，"+dataPageDockVO.getPlanCode());
+            tranDatadockingLog.setRemark("页面推送模式，" + dataPageDockVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("页面推送模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("页面推送模式，增加日志异常", e.getMessage());
         }
 
         return RespDTO.onSuc(url);
@@ -149,21 +177,21 @@ public class DataPageDockFacade {
     public PushDTO getEnginePush(DataEngineVO dataEngineVO) {
         PushVO pushVO = new PushVO();
         BeanUtil.copyProperties(dataEngineVO, pushVO);
-        PushDTO pushDTO=pushFacade.push(pushVO);
+        PushDTO pushDTO = pushFacade.push(pushVO);
         pushDTO.setDebug(null);
 
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataEngineVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataEngineVO));
             tranDatadockingLog.setParamOut(JSON.toJSONString(pushDTO));
-            tranDatadockingLog.setRemark("数据引擎模式，"+dataEngineVO.getPlanCode());
+            tranDatadockingLog.setRemark("数据引擎模式，" + dataEngineVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("数据引擎模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("数据引擎模式，增加日志异常", e.getMessage());
         }
 
         return pushDTO;
@@ -175,59 +203,58 @@ public class DataPageDockFacade {
      * @time: ${DATE} ${TIME}
      **/
     public RespDTO getEngineIndicationPush(DataEngineVO dataEngineVO) {
-        IndicationPushVO indicationPushVO=new IndicationPushVO();
+        IndicationPushVO indicationPushVO = new IndicationPushVO();
         BeanUtil.copyProperties(dataEngineVO, indicationPushVO);
         //ruleType（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:其他提醒）
         indicationPushVO.setRuleType("2,3,4");
-        IndicationDTO indicationDTO=pushFacade.indicationPush(indicationPushVO);
+        IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
         indicationDTO.setDebug(null);
 
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataEngineVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataEngineVO));
             tranDatadockingLog.setParamOut(JSON.toJSONString(dataEngineVO));
-            tranDatadockingLog.setRemark("数据引擎模式，"+dataEngineVO.getPlanCode());
+            tranDatadockingLog.setRemark("数据引擎模式，" + dataEngineVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("数据引擎模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("数据引擎模式，增加日志异常", e.getMessage());
         }
 
         if (indicationDTO != null) {
             if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList()) || ListUtil.isNotEmpty(indicationDTO.getHighRiskList())
-                    || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList()))
-            {
+                    || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList())) {
                 return RespDTO.onSuc(indicationDTO);
-            }else{
+            } else {
                 return RespDTO.onError("无开单合理性提醒！");
             }
-        }else{
+        } else {
             return RespDTO.onError("无开单合理性提醒！");
         }
     }
 
 
-    public PushPlanDTO getOperationPlanPush(DataEngineVO dataEngineVO){
-        PushPlanVO pushPlanVO=new PushPlanVO();
+    public PushPlanDTO getOperationPlanPush(DataEngineVO dataEngineVO) {
+        PushPlanVO pushPlanVO = new PushPlanVO();
         BeanUtil.copyProperties(dataEngineVO, pushPlanVO);
 
-        PushPlanDTO pushPlanDTO=pushFacade.pushPlan(pushPlanVO);
+        PushPlanDTO pushPlanDTO = pushFacade.pushPlan(pushPlanVO);
         pushPlanDTO.setDebug(null);
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataEngineVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataEngineVO));
             tranDatadockingLog.setParamOut(JSON.toJSONString(pushPlanDTO));
-            tranDatadockingLog.setRemark("数据引擎模式，"+dataEngineVO.getPlanCode());
+            tranDatadockingLog.setRemark("数据引擎模式，" + dataEngineVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("数据引擎模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("数据引擎模式，增加日志异常", e.getMessage());
         }
         return pushPlanDTO;
     }