Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

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

@@ -1,7 +1,6 @@
package com.yihu.jw.job;
import com.yihu.jw.internet.service.InternetCommonService;
import com.yihu.jw.internet.service.ykyy.YkyyInternetService;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
@@ -114,6 +113,14 @@ public class CommonDataUploadJob implements Job {
            }
            logger.info("END==========2.12 在线诊疗服务信息-过程图片上传 结束========" + res);
            logger.info("START========2.14 在线诊疗服务信息-过程图片上传 开始========");
            try {
                res = internetService.upNsInvokeTotal(startDate,endDate);
            }catch (Exception e){
                e.printStackTrace();
                logger.error(e.toString());
            }
            logger.info("END==========2.14 在线诊疗服务信息-过程图片上传 结束========" + res);
            logger.info("END========DataUploadJob 执行结束========");