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

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();
}

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

@@ -75,22 +75,25 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
    /**
     * 获取预约记录列表
     * @param patient
     * @param idcard
     * @param doctor
     * @param doctorName
     * @param opId
     * @param dept
     * @param startDate
     * @param endDate
     * @param chargeType
     * @return
     * @throws Exception
     */
    public JSONArray getAppointmentList(String patient,String doctor,String doctorName,String opId,String startDate,String endDate,String chargeType)throws Exception{
    public JSONArray getAppointmentList(String idcard,String doctor,String doctorName,String dept,String startDate,String endDate,String chargeType)throws Exception{
        logger.info("getAppointmentList :");
        String patientMappingId = null;
        if(StringUtils.isNotBlank(patient)){
            patientMappingId = patientMappingService.findHisPatNoByPatient(patient);
            logger.info("getAppointmentList patientMappingId:"+patientMappingId);
        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;
@@ -102,15 +105,7 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
            }
        }
        String opDoctorId = null;
        if(StringUtils.isNotBlank(opId)){
            DoctorMappingDO doctorMappingDO = doctorMappingService.findMappingCode(opId,"350211A1002");
            if(doctorMappingDO!=null){
                opDoctorId = doctorMappingDO.getMappingCode();
                logger.info("getAppointmentList opDoctorId:"+opDoctorId);
            }
        }
        return registerService.BS10047(patientMappingId,doctorMappingId,doctorName,opDoctorId,startDate,endDate,chargeType,demoFlag);
        return registerService.BS10047(idcard,doctorMappingId,doctorName,dept,startDate,endDate,chargeType,demoFlag);
    }
    /**
@@ -126,32 +121,6 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
        RegisterAmVO registerAmVO = objectMapper.readValue(appointmentJson,RegisterAmVO.class);
        //查找居民映射id
        if(StringUtils.isNotBlank(registerAmVO.getPatientId())){
            String patientMappingId = patientMappingService.findHisPatNoByPatient(registerAmVO.getPatientId());
            if(StringUtils.isBlank(patientMappingId)){
                throw new RuntimeException("未找到居民卡信息");
            }
            registerAmVO.setPatientId(patientMappingId);
        }else{
            throw new RuntimeException("未找到居民卡信息");
        }
        //查找医生映射id
        if(StringUtils.isNotBlank(registerAmVO.getAppType())){
            DoctorMappingDO doctorMappingDO = doctorMappingService.findMappingCode(registerAmVO.getAppType(),"350211A1002");
            if(doctorMappingDO!=null){
                String doctorMappingId = doctorMappingDO.getMappingCode();
                if(StringUtils.isBlank(doctorMappingId)){
                    throw new RuntimeException("未找医生映射信息");
                }
                registerAmVO.setAppType(doctorMappingId);
            }else{
                throw new RuntimeException("未找医生映射信息");
            }
        }else{
            throw new RuntimeException("医生信息为空");
        }
        if(StringUtils.isNotBlank(registerAmVO.getDoctor())){
            DoctorMappingDO doctorMappingDO = doctorMappingService.findMappingCode(registerAmVO.getDoctor(),"350211A1002");
@@ -171,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);
@@ -191,16 +170,6 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
    public net.sf.json.JSONObject cancelAppointment(String appointmentJson)throws Exception{
        RegisterAmVO registerAmVO = objectMapper.readValue(appointmentJson,RegisterAmVO.class);
        //查找居民映射id
        if(StringUtils.isNotBlank(registerAmVO.getPatientId())){
            String patientMappingId = patientMappingService.findHisPatNoByPatient(registerAmVO.getPatientId());
            if(StringUtils.isBlank(patientMappingId)){
                throw new RuntimeException("未找到居民卡信息");
            }
            registerAmVO.setPatientId(patientMappingId);
        }else{
            throw new RuntimeException("未找到居民卡信息");
        }
        //查找医生映射id
        if(StringUtils.isNotBlank(registerAmVO.getDoctor())){

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();
    }
}

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

@@ -64,9 +64,12 @@ public class RegisterService {
            //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("<MsgInfo><endNum>10</endNum>");
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <Msg>");
            sbs.append(" and unit_code = '"+dept+"' and (request_day between '"+startDate+"' and '"+endDate+"') ");
            sbs.append(" and (request_day between '"+startDate+"' and '"+endDate+"') ");
            if(StringUtils.isNotBlank(dept)){
                sbs.append(" and unit_code ='"+dept+"'");
            }
            if(StringUtils.isNotBlank(doctor_code)){
                sbs.append(" and doctor_code ='"+doctor_code+"'");
            }
@@ -110,12 +113,12 @@ public class RegisterService {
            //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("<MsgInfo><endNum>10</endNum>");
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <Msg/>");
            sbs.append(" <query compy=\"=\" item=\"unit_code\" splice=\"and\" value=\"'"+dept+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"doctor_code\" splice=\"and\" value=\"'"+doctor_code+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"CONVERT(varchar(100),yy_time,23)\" splice=\"and\" value=\"'"+date+"'\"/>");
            sbs.append(" <query compy=\"=\" item=\"yy_status\" splice=\"and\" value=\"'0'\"/>");
//            sbs.append(" <query compy=\"=\" item=\"yy_status\" splice=\"and\" value=\"'0'\"/>");
            sbs.append(" <query compy=\"=\" item=\"ampm\" splice=\"and\" value=\"'"+ampm+"'\"/>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
@@ -127,10 +130,10 @@ public class RegisterService {
    /**
     * BS10047 病人预约结果表 2.00
     * @param req_id 病人ID
     * @param social_no 病人ID
     * @param doctor_code   医生ID
     * @param doctor_name   医生名称支持模糊
     * @param op_id 预约医生
     * @param unit_code 部门
     * @param startDate 开始时间
     * @param endDate 结束时间
     * @param reg_type 号别
@@ -138,7 +141,7 @@ public class RegisterService {
     * @return
     * @throws Exception
     */
    public JSONArray BS10047(String req_id,String doctor_code,String doctor_name,String op_id,String startDate,String endDate,String reg_type,boolean demoFlag) throws Exception {
    public JSONArray BS10047(String social_no,String doctor_code,String doctor_name,String unit_code,String startDate,String endDate,String reg_type,boolean demoFlag) throws Exception {
        String fid="BS10047";
        String resp="";
        if (demoFlag) {
@@ -150,10 +153,10 @@ public class RegisterService {
            //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("<MsgInfo><endNum>10</endNum>");
            sbs.append("<Msg");
            if(StringUtils.isNotBlank(req_id)){
                sbs.append(" and req_id = '"+req_id+"' ");
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append("<Msg>");
            if(StringUtils.isNotBlank(social_no)){
                sbs.append(" and social_no = '"+social_no+"' ");
            }
            if(StringUtils.isNotBlank(doctor_code)){
                sbs.append(" and doctor_code = '"+doctor_code+"' ");
@@ -161,14 +164,11 @@ public class RegisterService {
            if(StringUtils.isNotBlank(doctor_name)){
                sbs.append(" and doctor_name like '%"+doctor_name+"%' ");
            }
            if(StringUtils.isNotBlank(op_id)){
                sbs.append(" and op_id = '"+op_id+"' ");
            }
            if(StringUtils.isNotBlank(startDate)){
                sbs.append(" and request_day >= '"+startDate+"' ");
            if(StringUtils.isNotBlank(unit_code)){
                sbs.append(" and unit_code = '"+unit_code+"' ");
            }
            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+"' ");
@@ -176,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);
    }
@@ -200,21 +201,22 @@ 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>10</endNum>");
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <query item=\"DeptCode\" value=\""+registerAmVO.getDept()+"\"/>");
            sbs.append(" <query item=\"DocCode\" value=\""+registerAmVO.getDoctor()+"\"/>");
            sbs.append(" <query item=\"SectionType\" value=\""+registerAmVO.getSectionType()+"\"/>");
            sbs.append(" <query item=\"StartTime\" value=\""+registerAmVO.getStartTime()+"\"/>");
            sbs.append(" <query item=\"PatientName\" value=\""+registerAmVO.getPatientName()+"\"/>");
            sbs.append(" <query item=\"PatientID\" value=\""+registerAmVO.getPatientId()+"\"/>");
            sbs.append(" <query item=\"PatientID\" value=\""+registerAmVO.getIdcard()+"\"/>");
            sbs.append(" <query item=\"PatientPhone\" value=\""+registerAmVO.getPatientPhone()+"\"/>\n");
            sbs.append(" <query item=\"app_type\" value=\""+registerAmVO.getAppType()+"\"/>");
            sbs.append(" <query item=\"app_type\" value=\"XS\"/>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            logger.info(fid+" resp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInRequest(resp);
    }
@@ -237,15 +239,15 @@ 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>10</endNum>");
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <query item=\"DeptCode\" value=\""+registerAmVO.getDept()+"\"/>");
            sbs.append(" <query item=\"DocCode\" value=\""+registerAmVO.getDoctor()+"\"/>");
            sbs.append(" <query item=\"SectionType\" value=\""+registerAmVO.getSectionType()+"\"/>");
            sbs.append(" <query item=\"StartTime\" value=\""+registerAmVO.getStartTime()+"\"/>");
            sbs.append(" <query item=\"PatientName\" value=\""+registerAmVO.getPatientName()+"\"/>");
            sbs.append(" <query item=\"PatientID\" value=\""+registerAmVO.getPatientId()+"\"/>");
            sbs.append(" <query item=\"PatientID\" value=\""+registerAmVO.getIdcard()+"\"/>");
            sbs.append(" <query item=\"PatientPhone\" value=\""+registerAmVO.getPatientPhone()+"\"/>\n");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");

business/base-service/src/main/java/com/yihu/jw/internet/service/DataGeneratorService.java

@@ -179,8 +179,8 @@ public class DataGeneratorService extends BaseJpaService<InternetUpErrorLogDO, I
        outpatientDO.setIcd10("ZZGX71");
        outpatientDO.setIcd10Name("肝血瘀阻证");
        outpatientDO.setRegisterNo(getCode());
        outpatientDO.setConNo(getCode());
        outpatientDO.setRegisterNo(getCode().substring(0,15));
        outpatientDO.setConNo(getCode().substring(0,15));
        outpatientDO.setPatientCancelRemark("test_info");
        return outpatientDao.save(outpatientDO);

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -795,22 +795,30 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("visit_dept_name", info.get("dept_name"));
                jb.put("pt_no", info.get("paName"));
                jb.put("pt_age", IdCardUtil.getAgeForIdcard(info.get("paId").toString()));
                jb.put("cost_type", info.get("charge_type").toString());
                jb.put("pt_birthdate", "");
                jb.put("ge_code", info.get("sex"));
//                jb.put("cost_type", info.get("charge_type").toString());
                jb.put("cost_type", "");
                jb.put("pt_birthdate", null);
                String sex = IdCardUtil.getSexForIdcard_new(info.get("paId").toString());
                jb.put("ge_code", sex=="3"?"9":sex);
                jb.put("pt_tel", info.get("moble"));
                jb.put("card_type", "1");
                jb.put("id_no", info.get("paId"));
                jb.put("pt_district", "");
                jb.put("pt_card_type", "");
                jb.put("pt_card_no",info.get("card_no"));
                jb.put("apply_time", info.get("create_time"));
                jb.put("visit_time", info.get("register_date"));
                Date createTime = (Date) info.get("create_time");
                jb.put("apply_time", DateUtil.dateToStr(createTime,"yyyy-MM-dd HH:mm:ss"));
                Date date = (Date) info.get("register_date");
                String dateStr = DateUtil.dateToStr(DateUtil.getPreDays(date,1),"yyyy-MMM-dd");
                jb.put("visit_time", DateUtil.dateToStr(date,"yyyy-MM-dd HH:mm:ss"));
                String dateStr = DateUtil.dateToStr(DateUtil.getPreDays(date,1),"yyyy-MM-dd");
                jb.put("visit_finish_time", dateStr+" 00:00:00");
                jb.put("old_diag_code", "");
                jb.put("old_diag_name", "");
                jb.put("diag_code",info.get("icd10"));
@@ -827,7 +835,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                dataError++;
                logger.error(e.toString());
            }
            String jbstr = jb.toJSONString();
            if(!errorFlag){
                JSONArray jsonArray = new JSONArray();
                jsonArray.add(jb);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/appointment/WlyyAppointmentDO.java

@@ -20,11 +20,10 @@ public class WlyyAppointmentDO extends UuidIdentityEntity {
    private String patient;//病人',
    private String patientName;//居民名称',
    private String patientPhone;//居民电话',
    private String idcard;//居民身份证
    private Integer type;//1 自己预约 2.代理预约',
    private String sectionType;//上午：AM 和 下午：PM，',
    private Date startTime;//预约时间',
    private String appType;//'代理医生工号',
    private String appTypeName;//代理医生名称',
    private String startTime;//预约时间',
    private Integer status;//1预约成功，0预约失败 -1预约取消',
    private String httpLog;//结果记录
    private Date createTime;//创建时间
@@ -101,30 +100,14 @@ public class WlyyAppointmentDO extends UuidIdentityEntity {
        this.sectionType = sectionType;
    }
    public Date getStartTime() {
    public String getStartTime() {
        return startTime;
    }
    public void setStartTime(Date startTime) {
    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
    public String getAppType() {
        return appType;
    }
    public void setAppType(String appType) {
        this.appType = appType;
    }
    public String getAppTypeName() {
        return appTypeName;
    }
    public void setAppTypeName(String appTypeName) {
        this.appTypeName = appTypeName;
    }
    public Integer getStatus() {
        return status;
    }
@@ -148,4 +131,12 @@ public class WlyyAppointmentDO extends UuidIdentityEntity {
    public void setHttpLog(String httpLog) {
        this.httpLog = httpLog;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
}

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;
    }
}

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";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/register/RegisterAmVO.java

@@ -21,7 +21,8 @@ public class RegisterAmVO {
    private String sectionType;
    private String startTime;
    private String patientName;
    private String patientId;
    private String patient;
    private String idcard;//居民身份证
    private String patientPhone;
    private String appType;
@@ -65,12 +66,12 @@ public class RegisterAmVO {
        this.patientName = patientName;
    }
    public String getPatientId() {
        return patientId;
    public String getPatient() {
        return patient;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getPatientPhone() {
@@ -88,4 +89,12 @@ public class RegisterAmVO {
    public void setAppType(String appType) {
        this.appType = appType;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
}

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,72 +46,79 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("prescription_overdue_job  job exist");
            }
            //互联网医院 监管平台上报
            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");
            //互联网医院 监管平台上报
            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_27_job  job exist");
                logger.info("data_upload_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("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");

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());
        }
    }
}

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 执行结束========");

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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());
//        }
//    }
//}

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

@@ -70,6 +70,20 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "isExist", method = RequestMethod.GET)
    public String isExist(String id) {
        try {
            if(quartzHelper.isExistJob(id)){
                return success("启动成功！");
            }
            return success("启动失败！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 生成过去几天的数据
     *

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

@@ -6,4 +6,18 @@ prescriptionStatus_update_job=0 */2 * * * ?
prescription_overdue_job=0 0 1 * * ?
#每天1 点触发
internet_update_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 * * ?

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 = "获取医生号源")
@@ -59,21 +62,21 @@ public class AppointmentEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Appointment.getAppointmentList)
    @ApiOperation(value = "获取预约记录列表")
    public ListEnvelop getAppointmentList(@ApiParam(name = "patient", value = "患者ID")
                                          @RequestParam(value = "patient",required = false) String patient,
    public ListEnvelop getAppointmentList(@ApiParam(name = "idcard", value = "患者idcard")
                                          @RequestParam(value = "idcard",required = false) String idcard,
                                          @ApiParam(name = "doctor", value = "医生ID精确查询")
                                          @RequestParam(value = "doctor",required = false)String doctor,
                                          @ApiParam(name = "doctorName", value = "医生姓名模糊")
                                          @RequestParam(value = "doctorName",required = false)String doctorName,
                                          @ApiParam(name = "opId", value = "操作医生")
                                          @RequestParam(value = "opId",required = false)String opId,
                                          @ApiParam(name = "dept", value = "部门")
                                          @RequestParam(value = "dept",required = false)String dept,
                                          @ApiParam(name = "chargeType", value = "号别")
                                          @RequestParam(value = "chargeType",required = false)String chargeType,
                                          @ApiParam(name = "startDate", value = "开始时间")
                                          @RequestParam(value = "startDate",required = true)String startDate,
                                          @ApiParam(name = "endDate", value = "结束时间")
                                          @RequestParam(value = "endDate",required = true)String endDate) throws Exception {
        return success(appointmentService.getAppointmentList(patient,doctor,doctorName,opId,startDate,endDate,chargeType));
        return success(appointmentService.getAppointmentList(idcard,doctor,doctorName,dept,startDate,endDate,chargeType));
    }
    @PostMapping(value = BaseHospitalRequestMapping.Appointment.makeAppointment)
@@ -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());
    }
}