Merge branch 'dev' of trick9191/wlyy2.0 into dev

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/event/ApplicationEvent.java

@@ -1,9 +1,9 @@
package com.yihu.jw.event;
import com.yihu.jw.job.InternetUpdateJob;
import com.yihu.jw.job.PrescriptionOverdueJob;
import com.yihu.jw.job.PrescriptionStatusUpdateJob;
import com.yihu.jw.job.QuartzHelper;
import com.yihu.jw.job.dataupload.*;
import com.yihu.jw.util.SystemConf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,13 +46,71 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("prescription_overdue_job  job exist");
            }
            //互联网医院 监管平台上报 job
            if (!quartzHelper.isExistJob("internet_update_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("internet_update_job");
                quartzHelper.addJob(InternetUpdateJob.class, trigger, "internet_update_job", new HashMap<String, Object>());
                logger.info("internet_update_job  job success");
            //互联网医院 监管平台上报
            String trigger = SystemConf.getInstance().getSystemProperties().getProperty("internet_update_job");
            // 2.3 网上预约挂号上传  job
            if (!quartzHelper.isExistJob("data_upload_23_job")) {
                quartzHelper.addJob(DataUpload23Job.class, trigger, "data_upload_23_job", new HashMap<String, Object>());
                logger.info("data_upload_23_job  job success");
            } else {
                logger.info("data_upload_23_job  job exist");
            }
            //2.5 网上预约挂号上传
            if (!quartzHelper.isExistJob("data_upload_25_job")) {
                quartzHelper.addJob(DataUpload25Job.class, trigger, "data_upload_25_job", new HashMap<String, Object>());
                logger.info("data_upload_25_job  job success");
            } else {
                logger.info("data_upload_25_job  job exist");
            }
            //2.6 网上医技预约上传开始
            if (!quartzHelper.isExistJob("data_upload_26_job")) {
                quartzHelper.addJob(DataUpload26Job.class, trigger, "data_upload_26_job", new HashMap<String, Object>());
                logger.info("data_upload_26_job  job success");
            } else {
                logger.info("data_upload_26_job  job exist");
            }
            //2.7 医生评价信息开始
            if (!quartzHelper.isExistJob("data_upload_27_job")) {
                quartzHelper.addJob(DataUpload27Job.class, trigger, "data_upload_27_job", new HashMap<String, Object>());
                logger.info("data_upload_27_job  job success");
            } else {
                logger.info("data_upload_27_job  job exist");
            }
            //2.8 网络咨询服务信息开始
            if (!quartzHelper.isExistJob("data_upload_28_job")) {
                quartzHelper.addJob(DataUpload28Job.class, trigger, "data_upload_28_job", new HashMap<String, Object>());
                logger.info("data_upload_28_job  job success");
            } else {
                logger.info("data_upload_28_job  job exist");
            }
            //2.9 网络诊疗服务信息
            if (!quartzHelper.isExistJob("data_upload_29_job")) {
                quartzHelper.addJob(DataUpload29Job.class, trigger, "data_upload_29_job", new HashMap<String, Object>());
                logger.info("data_upload_29_job  job success");
            } else {
                logger.info("data_upload_29_job  job exist");
            }
            //2.10 电子处方表
            if (!quartzHelper.isExistJob("data_upload_210_job")) {
                quartzHelper.addJob(DataUpload210Job.class, trigger, "data_upload_210_job", new HashMap<String, Object>());
                logger.info("data_upload_210_job  job success");
            } else {
                logger.info("data_upload_210_job  job exist");
            }
            //2.11 电子处方_药品明细表
            if (!quartzHelper.isExistJob("data_upload_211_job")) {
                quartzHelper.addJob(DataUpload211Job.class, trigger, "data_upload_211_job", new HashMap<String, Object>());
                logger.info("data_upload_211_job  job success");
            } else {
                logger.info("internet_update_job  job exist");
                logger.info("data_upload_211_job  job exist");
            }
        } catch (Exception e) {

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/InternetUpdateJob.java

@@ -1,70 +1,70 @@
package com.yihu.jw.job;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * 互联网监管平台更新 job
 * Created by cws on 2019/2/20.
 */
public class InternetUpdateJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(InternetUpdateJob.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========InternetUpdateJob========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.3 网上预约挂号上传开始========");
            res = internetService.upNsDoctorRecord(startDate,endDate);
            logger.info("END==========2.3 网上预约挂号上传结束 ========" + res);
            logger.info("START========2.5 网上预约挂号上传开始========");
            res = internetService.upAppointmentOnline(startDate,endDate);
            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
            logger.info("START========2.6 网上医技预约上传开始========");
            res = internetService.upMedicalOnline(startDate,endDate);
            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("START========2.7 医生评价信息开始========");
            res = internetService.upNsDoctorScore(startDate,endDate);
            logger.info("END==========2.7 医生评价信息结束========" + res);
            logger.info("START========2.8 网络咨询服务信息开始========");
            res = internetService.upNsOnlineAsk(startDate,endDate);
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("START========2.9 网络诊疗服务信息========");
            res = internetService.upNsOnlineMed(startDate,endDate);
            logger.info("END==========2.9 网络诊疗服务信息========" + res);
            logger.info("START========2.10 电子处方表开始========");
            res = internetService.upPrescription(startDate,endDate);
            logger.info("END==========2.10 电子处方表结束========" + res);
            logger.info("START========2.11 电子处方_药品明细表开始 ========");
            res = internetService.upPrescriptionDrug(startDate,endDate);
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========InternetUpdateJob 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===InternetUpdateJob,message:"+e.getMessage());
        }
    }
}
//package com.yihu.jw.job;
//
//import com.yihu.jw.internet.service.InternetService;
//import com.yihu.jw.util.date.DateUtil;
//import org.quartz.Job;
//import org.quartz.JobExecutionContext;
//import org.quartz.JobExecutionException;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
//
///**
// * 互联网监管平台更新 job
// * Created by cws on 2019/2/20.
// */
//public class InternetUpdateJobateJob implements Job {
//    private static final Logger logger = LoggerFactory.getLogger(InternetUpdateJob.class);
//    @Autowired
//    private InternetService internetService;
//    @Override
//    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
//        logger.info("START========InternetUpdateJob========");
//        try {
//            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
//            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
//            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
//
//            String res = "";
//
//            // 2、分步执行需要JOB执行的服务
//            logger.info("START========2.3 网上预约挂号上传开始========");
//            res = internetService.upNsDoctorRecord(startDate,endDate);
//            logger.info("END==========2.3 网上预约挂号上传结束 ========" + res);
//
//            logger.info("START========2.5 网上预约挂号上传开始========");
//            res = internetService.upAppointmentOnline(startDate,endDate);
//            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
//
//            logger.info("START========2.6 网上医技预约上传开始========");
//            res = internetService.upMedicalOnline(startDate,endDate);
//            logger.info("END==========2.6 网上医技预约上传结束========" + res);
//
//            logger.info("START========2.7 医生评价信息开始========");
//            res = internetService.upNsDoctorScore(startDate,endDate);
//            logger.info("END==========2.7 医生评价信息结束========" + res);
//
//            logger.info("START========2.8 网络咨询服务信息开始========");
//            res = internetService.upNsOnlineAsk(startDate,endDate);
//            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
//
//            logger.info("START========2.9 网络诊疗服务信息========");
//            res = internetService.upNsOnlineMed(startDate,endDate);
//            logger.info("END==========2.9 网络诊疗服务信息========" + res);
//
//            logger.info("START========2.10 电子处方表开始========");
//            res = internetService.upPrescription(startDate,endDate);
//            logger.info("END==========2.10 电子处方表结束========" + res);
//
//            logger.info("START========2.11 电子处方_药品明细表开始 ========");
//            res = internetService.upPrescriptionDrug(startDate,endDate);
//            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
//
//            logger.info("END========InternetUpdateJob 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===InternetUpdateJob,message:"+e.getMessage());
//        }
//    }
//}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/PrescriptionOverdueJob.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 */
public class PrescriptionOverdueJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(InternetUpdateJob.class);
    private static final Logger logger = LoggerFactory.getLogger(PrescriptionOverdueJob.class);
    @Autowired
    private PrescriptionStatusUpdateService prescriptionStatusUpdateService;
    @Override

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload210Job.java

@@ -0,0 +1,44 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload210Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload210Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload210Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.10 电子处方表开始========");
            res = internetService.upPrescription(startDate,endDate);
            logger.info("END==========2.10 电子处方表结束========" + res);
            logger.info("END========dataUpload210Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload210Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload211Job.java

@@ -0,0 +1,43 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload211Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload211Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload211Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.11 电子处方_药品明细表开始 ========");
            res = internetService.upPrescriptionDrug(startDate,endDate);
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========dataUpload211Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload211Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload23Job.java

@@ -0,0 +1,43 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload23Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload23Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload23Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.3 网上预约挂号上传开始========");
            res = internetService.upNsDoctorRecord(startDate,endDate);
            logger.info("END==========2.3 网上预约挂号上传结束 ========" + res);
            logger.info("END========dataUpload23Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload23Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload25Job.java

@@ -0,0 +1,43 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload25Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload25Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload25Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.5 网上预约挂号上传开始========");
            res = internetService.upAppointmentOnline(startDate,endDate);
            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
            logger.info("END========dataUpload25Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload25Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload26Job.java

@@ -0,0 +1,44 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload26Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload26Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload26Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.6 网上医技预约上传开始========");
            res = internetService.upMedicalOnline(startDate,endDate);
            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("END========dataUpload26Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload26Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload27Job.java

@@ -0,0 +1,45 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload27Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload27Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload27Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.7 医生评价信息开始========");
            res = internetService.upNsDoctorScore(startDate,endDate);
            logger.info("END==========2.7 医生评价信息结束========" + res);
            logger.info("END========dataUpload27Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload27Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload28Job.java

@@ -0,0 +1,45 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload28Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload28Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload28Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.8 网络咨询服务信息开始========");
            res = internetService.upNsOnlineAsk(startDate,endDate);
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("END========dataUpload28Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload28Job,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload29Job.java

@@ -0,0 +1,44 @@
package com.yihu.jw.job.dataupload;
import com.yihu.jw.internet.service.InternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * Created by Trick on 2019/10/22.
 */
public class DataUpload29Job implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUpload29Job.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========dataUpload29Job========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.9 网络诊疗服务信息========");
            res = internetService.upNsOnlineMed(startDate,endDate);
            logger.info("END==========2.9 网络诊疗服务信息========" + res);
            logger.info("END========dataUpload29Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===InternetUpdateJob,message:"+e.getMessage());
        }
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@@ -222,48 +222,54 @@ public class JobController extends BaseController {
    @RequestMapping(value = "/internetUpload", method = RequestMethod.GET)
    @ApiOperation("监管平台测试")
    public String internetUpload(String taskId) {
    public String internetUpload(String taskId,String endDate,String startDate) {
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 00：00：00 执行,同步前一天的数据
            String endDate = DateUtil.dateToStrLong(DateUtil.getNow());
            String startDate = DateUtil.dateToStrLong(DateUtil.getPreDays(DateUtil.getNow(),1));
            String res = "";
            // 2、分步执行需要JOB执行的服务
            logger.info("START========2.3 网上预约挂号上传开始========");
            res = internetService.upNsDoctorRecord(startDate,endDate);
            logger.info("END==========2.3 网上预约挂号上传结束 ========" + res);
            logger.info("START========2.5 网上预约挂号上传开始========");
            res = internetService.upAppointmentOnline(startDate,endDate);
            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
            logger.info("START========2.6 网上医技预约上传开始========");
            res = internetService.upMedicalOnline(startDate,endDate);
            logger.info("END==========2.5 网上医技预约上传结束========" + res);
            logger.info("START========2.7 医生评价信息开始========");
            res = internetService.upNsDoctorScore(startDate,endDate);
            logger.info("END==========2.7 医生评价信息结束========" + res);
            logger.info("START========2.8 网络咨询服务信息开始========");
            res = internetService.upNsOnlineAsk(startDate,endDate);
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("START========2.9 网络咨询服务信息开始========");
            res = internetService.upNsOnlineMed(startDate,endDate);
            logger.info("END==========2.9 网络咨询服务信息结束========" + res);
            logger.info("START========2.10 电子处方表开始========");
            res = internetService.upPrescription(startDate,endDate);
            logger.info("END==========2.10 电子处方表结束========" + res);
            logger.info("START========2.11 电子处方_药品明细表开始 ========");
            res = internetService.upPrescriptionDrug(startDate,endDate);
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========InternetUpdateJob 执行结束========");
            switch(taskId){
                case "2.3" :
                    // 2、分步执行需要JOB执行的服务
                    logger.info("START========2.3 网上预约挂号上传开始========");
                    res = internetService.upNsDoctorRecord(startDate,endDate);
                    logger.info("END==========2.3 网上预约挂号上传结束 ========" + res);
                    break; 
                case "2.5" :
                    logger.info("START========2.5 网上预约挂号上传开始========");
                    res = internetService.upAppointmentOnline(startDate,endDate);
                    logger.info("END==========2.5 网上预约挂号上传结束========" + res);
                    break; 
                case "2.6" :
                    logger.info("START========2.6 网上医技预约上传开始========");
                    res = internetService.upMedicalOnline(startDate,endDate);
                    logger.info("END==========2.5 网上医技预约上传结束========" + res);
                    break; 
                case "2.7" :
                    logger.info("START========2.7 医生评价信息开始========");
                    res = internetService.upNsDoctorScore(startDate,endDate);
                    logger.info("END==========2.7 医生评价信息结束========" + res);
                    break; 
                case "2.8" :
                    logger.info("START========2.8 网络咨询服务信息开始========");
                    res = internetService.upNsOnlineAsk(startDate,endDate);
                    logger.info("END==========2.8 网络咨询服务信息结束========" + res);
                    break; 
                case "2.9" :
                    logger.info("START========2.9 网络咨询服务信息开始========");
                    res = internetService.upNsOnlineMed(startDate,endDate);
                    logger.info("END==========2.9 网络咨询服务信息结束========" + res);
                    break; 
                case "2.10" :
                    logger.info("START========2.10 电子处方表开始========");
                    res = internetService.upPrescription(startDate,endDate);
                    logger.info("END==========2.10 电子处方表结束========" + res);
                    break; 
                case "2.11" :
                    logger.info("START========2.11 电子处方_药品明细表开始 ========");
                    res = internetService.upPrescriptionDrug(startDate,endDate);
                    logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
                    break;
                default :
            }
            return success("success");
        } catch (Exception e) {
            error(e);