Selaa lähdekoodia

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

trick9191 5 vuotta sitten
vanhempi
commit
991a235b44
19 muutettua tiedostoa jossa 709 lisäystä ja 445 poistoa
  1. 18 0
      business/base-service/src/main/java/com/yihu/jw/hospital/appointment/dao/SpecialDiseaseDao.java
  2. 20 2
      business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/AppointmentService.java
  3. 25 0
      business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/SpecialDiseaseService.java
  4. 5 7
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/RegisterService.java
  5. 42 0
      common/common-entity/src/main/java/com/yihu/jw/entity/hospital/appointment/WlyySpecialDiseaseDO.java
  6. 1 0
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java
  7. 69 60
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/event/ApplicationEvent.java
  8. 106 0
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/DataUploadJob.java
  9. 48 12
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/InternetUpdateJob.java
  10. 44 44
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload210Job.java
  11. 43 43
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload211Job.java
  12. 43 43
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload23Job.java
  13. 43 43
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload25Job.java
  14. 44 44
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload26Job.java
  15. 45 45
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload27Job.java
  16. 45 45
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload28Job.java
  17. 44 44
      svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/dataupload/DataUpload29Job.java
  18. 15 13
      svr/svr-internet-hospital-job/src/main/resources/system.properties
  19. 9 0
      svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/appointment/AppointmentEndPoint.java

+ 18 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/appointment/dao/SpecialDiseaseDao.java

@ -0,0 +1,18 @@
package com.yihu.jw.hospital.appointment.dao;
import com.yihu.jw.entity.hospital.appointment.WlyyAppointmentDO;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/11/4.
 */
public interface SpecialDiseaseDao extends PagingAndSortingRepository<WlyySpecialDiseaseDO, String>, JpaSpecificationExecutor<WlyySpecialDiseaseDO> {
    @Query("from WlyySpecialDiseaseDO a order by a.sort asc")
    List<WlyySpecialDiseaseDO> findAllOrderBySortASC();
}

+ 20 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/AppointmentService.java

@ -88,6 +88,14 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
    public JSONArray getAppointmentList(String idcard,String doctor,String doctorName,String dept,String startDate,String endDate,String chargeType)throws Exception{
        logger.info("getAppointmentList :");
        if(StringUtils.isBlank(startDate)){
            throw new RuntimeException("startDate is not null");
        }
        if(StringUtils.isBlank(endDate)){
            throw new RuntimeException("endDate is not null");
        }
        String doctorMappingId = null;
        if(StringUtils.isNotBlank(doctor)){
            DoctorMappingDO doctorMappingDO = doctorMappingService.findMappingCode(doctor,"350211A1002");
@ -132,10 +140,20 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
        net.sf.json.JSONObject res = registerService.BS10048(registerAmVO,demoFlag);
        logger.info(res.toString());
        if(res!=null){
            logger.info(res.toString());
            String code = res.getString("code");
            if(StringUtils.isNotBlank(code)&&"-1".equals(code)){
                wlyyAppointmentDO.setStatus(1);
            }else {
                wlyyAppointmentDO.setStatus(0);
            }
        }else{
            wlyyAppointmentDO.setStatus(0);
        }
        wlyyAppointmentDO.setCreateTime(new Date());
        wlyyAppointmentDO.setStatus(2);
        wlyyAppointmentDO.setType(1);
        wlyyAppointmentDO.setHttpLog(res.toString());
        wlyyAppointmentDao.save(wlyyAppointmentDO);

+ 25 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/SpecialDiseaseService.java

@ -0,0 +1,25 @@
package com.yihu.jw.hospital.appointment.service;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import com.yihu.jw.hospital.appointment.dao.SpecialDiseaseDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by Trick on 2019/11/4.
 */
@Service
@Transactional
public class SpecialDiseaseService extends BaseJpaService<WlyySpecialDiseaseDO, SpecialDiseaseDao> {
    @Autowired
    private SpecialDiseaseDao specialDiseaseDao;
    public List<WlyySpecialDiseaseDO> findAllSpecialDisease(){
        return specialDiseaseDao.findAllOrderBySortASC();
    }
}

+ 5 - 7
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/RegisterService.java

@ -167,11 +167,8 @@ public class RegisterService {
            if(StringUtils.isNotBlank(unit_code)){
                sbs.append(" and unit_code = '"+unit_code+"' ");
            }
            if(StringUtils.isNotBlank(startDate)){
                sbs.append(" and request_day >= '"+startDate+"' ");
            }
            if(StringUtils.isNotBlank(endDate)){
                sbs.append(" and request_day <= '"+endDate+"' ");
            if(StringUtils.isNotBlank(startDate)&&StringUtils.isNotBlank(endDate)){
                sbs.append(" and (request_day between '"+startDate+"' and '"+endDate+"' )");
            }
            if(StringUtils.isNotBlank(reg_type)){
                sbs.append(" and reg_type = '"+reg_type+"' ");
@ -179,8 +176,9 @@ public class RegisterService {
            sbs.append("</Msg>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            logger.info(fid+" xmlresp:"+resp);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            //logger.info(fid+" resp:"+resp);
            logger.info(fid+" jsonresp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
@ -241,7 +239,7 @@ public class RegisterService {
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader :固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            sbs.append("</Msg>");
            sbs.append("<Msg/>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <query item=\"DeptCode\" value=\""+registerAmVO.getDept()+"\"/>");

+ 42 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/appointment/WlyySpecialDiseaseDO.java

@ -0,0 +1,42 @@
package com.yihu.jw.entity.hospital.appointment;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2019/11/4.
 */
@Entity
@Table(name = "wlyy_special_disease")
public class WlyySpecialDiseaseDO extends UuidIdentityEntity {
    private String name;
    private String code;
    private Integer sort;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

+ 1 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@ -30,6 +30,7 @@ public class BaseHospitalRequestMapping {
        public static final String makeAppointment = "/makeAppointment";
        public static final String cancelAppointment = "/cancelAppointment";
        public static final String getDoctorByMappingCode = "/getDoctorByMappingCode";
        public static final String findAllSpecialDisease = "/findAllSpecialDisease";
    }

+ 69 - 60
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.DataUploadJob;
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,70 +46,79 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("prescription_overdue_job  job exist");
            }
            //互联网医院 监管平台上报
            //2.5 网上预约挂号上传
            if (!quartzHelper.isExistJob("data_upload_25_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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");
            //互联网医院 监管平台上报
            if (!quartzHelper.isExistJob("data_upload_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("data_upload_job");
                quartzHelper.addJob(DataUploadJob.class, trigger, "data_upload_job", new HashMap<String, Object>());
                logger.info("data_upload_job  job success");
            } else {
                logger.info("data_upload_29_job  job exist");
                logger.info("data_upload_job  job exist");
            }
            //2.10 电子处方表
            if (!quartzHelper.isExistJob("data_upload_210_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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("data_upload_211_job  job exist");
            }
            //2.5 网上预约挂号上传
//            if (!quartzHelper.isExistJob("data_upload_25_job")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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")) {
//                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("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("data_upload_211_job  job exist");
//            }
        } catch (Exception e) {
            logger.info("followup_plan_remind job start failed");

+ 106 - 0
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/job/DataUploadJob.java

@ -0,0 +1,106 @@
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;
/**
 * Created by Trick on 2019/11/4.
 */
public class DataUploadJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(DataUploadJob.class);
    @Autowired
    private InternetService internetService;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========DataUploadJob========");
        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 网上预约挂号上传开始========");
            try {
                res = internetService.upAppointmentOnline(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
            logger.info("START========2.6 网上医技预约上传开始========");
            try {
                res = internetService.upMedicalOnline(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("START========2.7 医生评价信息开始========");
            try {
                res = internetService.upNsDoctorScore(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.7 医生评价信息结束========" + res);
            logger.info("START========2.8 网络咨询服务信息开始========");
            try {
                res = internetService.upNsOnlineAsk(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("START========2.9 网络诊疗服务信息========");
            try {
                res = internetService.upNsOnlineMed(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.9 网络诊疗服务信息========" + res);
            logger.info("START========2.10 电子处方表开始========");
            try {
                res = internetService.upPrescription(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.10 电子处方表结束========" + res);
            logger.info("START========2.11 电子处方_药品明细表开始 ========");
            try {
                res = internetService.upPrescriptionDrug(startDate,endDate,null);
            }catch (Exception e){
                logger.error(e.toString());
            }
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========DataUploadJob 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===DataUploadJob,message:"+e.getMessage());
        }
    }
}

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

@ -14,7 +14,7 @@
// * Created by cws on 2019/2/20.
// */
//public class InternetUpdateJobateJob implements Job {
//    private static final Logger logger = LoggerFactory.getLogger(InternetUpdateJob.class);
//    private static final Logger logger = LoggerFactory.getLogger(InternetUpdateJobateJob.class);
//    @Autowired
//    private InternetService internetService;
//    @Override
@ -28,36 +28,72 @@
//            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);
//            try {
//                res = internetService.upAppointmentOnline(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
//
//
//
//            logger.info("START========2.6 网上医技预约上传开始========");
//            res = internetService.upMedicalOnline(startDate,endDate);
//            try {
//                res = internetService.upMedicalOnline(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.6 网上医技预约上传结束========" + res);
//
//
//
//            logger.info("START========2.7 医生评价信息开始========");
//            res = internetService.upNsDoctorScore(startDate,endDate);
//            try {
//                res = internetService.upNsDoctorScore(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.7 医生评价信息结束========" + res);
//
//
//
//            logger.info("START========2.8 网络咨询服务信息开始========");
//            res = internetService.upNsOnlineAsk(startDate,endDate);
//            try {
//                res = internetService.upNsOnlineAsk(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
//
//
//
//            logger.info("START========2.9 网络诊疗服务信息========");
//            res = internetService.upNsOnlineMed(startDate,endDate);
//            try {
//                res = internetService.upNsOnlineMed(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.9 网络诊疗服务信息========" + res);
//
//
//
//            logger.info("START========2.10 电子处方表开始========");
//            res = internetService.upPrescription(startDate,endDate);
//            try {
//                res = internetService.upPrescription(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.10 电子处方表结束========" + res);
//
//
//
//            logger.info("START========2.11 电子处方_药品明细表开始 ========");
//            res = internetService.upPrescriptionDrug(startDate,endDate);
//            try {
//                res = internetService.upPrescriptionDrug(startDate,endDate,null);
//            }catch (Exception e){
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
//
//            logger.info("END========InternetUpdateJob 执行结束========");

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

@ -1,44 +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,null);
            logger.info("END==========2.10 电子处方表结束========" + res);
            logger.info("END========dataUpload210Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload210Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.10 电子处方表结束========" + res);
//
//
//            logger.info("END========dataUpload210Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload210Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,43 +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,null);
            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========dataUpload211Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload211Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
//
//            logger.info("END========dataUpload211Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload211Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,43 +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,null);
            logger.info("END==========2.3 医师基本信息 ========" + res);
            logger.info("END========dataUpload23Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload23Job,message:"+e.getMessage());
        }
    }
}
//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.upNsOnlineMedDoctorRecord(startDate,endDate,null);
//            logger.info("END==========2.3 医师基本信息 ========" + res);
//
//            logger.info("END========dataUpload23Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload23Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,43 +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,null);
            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
            logger.info("END========dataUpload25Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload25Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.5 网上预约挂号上传结束========" + res);
//
//            logger.info("END========dataUpload25Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload25Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,44 +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,null);
            logger.info("END==========2.6 网上医技预约上传结束========" + res);
            logger.info("END========dataUpload26Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload26Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.6 网上医技预约上传结束========" + res);
//
//            logger.info("END========dataUpload26Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload26Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,45 +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,null);
            logger.info("END==========2.7 医生评价信息结束========" + res);
            logger.info("END========dataUpload27Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload27Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.7 医生评价信息结束========" + res);
//
//
//            logger.info("END========dataUpload27Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload27Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,45 +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,null);
            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
            logger.info("END========dataUpload28Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===dataUpload28Job,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.8 网络咨询服务信息结束========" + res);
//
//
//            logger.info("END========dataUpload28Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===dataUpload28Job,message:"+e.getMessage());
//        }
//    }
//}

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

@ -1,44 +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,null);
            logger.info("END==========2.9 网络诊疗服务信息========" + res);
            logger.info("END========dataUpload29Job 执行结束========");
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("END===ERROE===InternetUpdateJob,message:"+e.getMessage());
        }
    }
}
//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,null);
//            logger.info("END==========2.9 网络诊疗服务信息========" + res);
//
//            logger.info("END========dataUpload29Job 执行结束========");
//
//        } catch (Exception e) {
//            e.printStackTrace();
//            logger.error("END===ERROE===InternetUpdateJob,message:"+e.getMessage());
//        }
//    }
//}

+ 15 - 13
svr/svr-internet-hospital-job/src/main/resources/system.properties

@ -6,16 +6,18 @@ prescriptionStatus_update_job=0 */2 * * * ?
prescription_overdue_job=0 0 1 * * ?
#每天1 点触发
data_upload_25_job=0 0 1 * * ?
data_upload_26_job=0 0 1 * * ?
data_upload_27_job=0 0 1 * * ?
data_upload_28_job=0 0 1 * * ?
data_upload_29_job=0 0 1 * * ?
data_upload_210_job=0 0 1 * * ?
data_upload_211_job=0 0 1 * * ?
data_upload_job=0 0 0 * * ?
#data_upload_25_job=0 0 1 * * ?
#
#data_upload_26_job=0 0 1 * * ?
#
#data_upload_27_job=0 0 1 * * ?
#
#data_upload_28_job=0 0 1 * * ?
#
#data_upload_29_job=0 0 1 * * ?
#
#data_upload_210_job=0 0 1 * * ?
#
#data_upload_211_job=0 0 1 * * ?

+ 9 - 0
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/appointment/AppointmentEndPoint.java

@ -1,6 +1,7 @@
package com.yihu.jw.hospital.endpoint.appointment;
import com.yihu.jw.hospital.appointment.service.AppointmentService;
import com.yihu.jw.hospital.appointment.service.SpecialDiseaseService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@ -24,6 +25,8 @@ public class AppointmentEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppointmentService appointmentService;
    @Autowired
    private SpecialDiseaseService specialDiseaseService;
    @GetMapping(value = BaseHospitalRequestMapping.Appointment.getDoctorSchedule)
    @ApiOperation(value = "获取医生号源")
@ -96,4 +99,10 @@ public class AppointmentEndPoint extends EnvelopRestEndpoint {
                                        @RequestParam(value = "mappingCode",required = false) String mappingCode) throws Exception {
        return success(appointmentService.getDoctorByMappingCode(mappingCode));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Appointment.findAllSpecialDisease)
    @ApiOperation(value = "获取专病字典")
    public ListEnvelop findAllSpecialDisease() throws Exception {
        return success(specialDiseaseService.findAllSpecialDisease());
    }
}