Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -75,6 +75,8 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            } else {
                logger.info("sfexpress reorder job job exist");
            }
            //同步智业字典 每晚1点同步
            if (!quartzHelper.isExistJob("zy_dict_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("zy_dict_job");
@@ -84,6 +86,15 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("zy_dict_job job exist");
            }
            //遍历支付成功，院内结算失败的的记录，重新结算，10分钟跑一次
            if (!quartzHelper.isExistJob("zy_execute_sick_settle_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("zy_execute_sick_settle_job");
                quartzHelper.addJob(PrescriptionExecuteSickSettleJob.class, trigger, "zy_execute_sick_settle_job", new HashMap<String, Object>());
                logger.info("zy_execute_sick_settle_job reorder job job success");
            } else {
                logger.info("zy_execute_sick_settle_job reorder job job exist");
            }
        } catch (Exception e) {
            logger.info("sign end job start failed");

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/PrescriptionExecuteSickSettleJob.java

@@ -40,6 +40,7 @@ public class PrescriptionExecuteSickSettleJob implements Job {
                        jwPrescriptionService.executeSickSettle(code);
                    }catch (Exception e){
                        logger.info("ERROR======重新执行院内结算的JOB,CODE:"+code+",message:" +e.getMessage());
                        continue;
                    }
                }
            }

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -87,6 +87,10 @@ sfexpress_reorder_job=0 0/10 * * * ?
#同步智业字典
zy_dict_job=0 0 1 * * ?
#遍历支付成功，院内结算失败的的记录，重新结算，10分钟跑一次
zy_execute_sick_settle_job=0 0/10 * * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html
#统一支付平台支付接口地址

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/express/SFExpressApiController.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.web.express;
package com.yihu.wlyy.web.gateway.controller.express;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.service.app.express.SFExpressService;