网关

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/DoctorZsInfoDao.java

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.doctor.BaseDoctorZsInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/9/16.
 */
public interface DoctorZsInfoDao extends PagingAndSortingRepository<BaseDoctorZsInfoDO, String>, JpaSpecificationExecutor<BaseDoctorZsInfoDO> {
    List<BaseDoctorZsInfoDO> findByIdNumber(String idNumber);
}

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

@@ -243,17 +243,22 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +
                " o.patient = '"+patient+"' AND o.outpatient_type != '2' ";
                " o.patient = ? AND o.outpatient_type != '2' ";
        List<Object> totalParams = new ArrayList<>();
        totalParams.add(patient);
        if(status!=null){
            totalSql +=  " AND o.status = "+status;
            totalSql +=  " AND o.status = ? ";
            totalParams.add(status);
        }
        if(StringUtils.isNotBlank(startTime)){
            totalSql += " AND create_time >='"+startTime+" 00:00:00'";
            totalSql += " AND create_time >= ? ";
            totalParams.add(startTime+" 00:00:00");
        }
        if(StringUtils.isNotBlank(endTime)){
            totalSql += " AND create_time <='"+endTime+" 23:59:59' ";
            totalSql += " AND create_time <= ? ";
            totalParams.add(endTime+" 23:59:59");
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql,totalParams.toArray());
        Long count = 0L;
        if (rstotal != null && rstotal.size() > 0) {
            count = (Long) rstotal.get(0).get("total");
@@ -291,18 +296,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +
                " o.patient = '"+patient+"'";
                " o.patient = ? ";
        List<Object> params = new ArrayList<>();
        params.add(patient);
        if(status!=null){
            sql +=  " AND o.status = "+status;
            sql +=  " AND o.status = ? ";
            params.add(status);
        }
        if(StringUtils.isNotBlank(startTime)){
            sql += " AND o.create_time >='"+startTime+" 00:00:00'";
            sql += " AND o.create_time >= ? ";
            params.add(startTime+" 00:00:00");
        }
        if(StringUtils.isNotBlank(endTime)){
            sql += " AND o.create_time <='"+endTime+" 23:59:59'";
            sql += " AND o.create_time <= ? ";
            params.add(endTime+" 23:59:59");
        }
        sql += " AND o.outpatient_type != '2' ORDER BY o.create_time DESC LIMIT " + (page - 1) * size + "," + size + " ";
        List<WlyyOutpatientVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WlyyOutpatientVO.class));
        List<WlyyOutpatientVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WlyyOutpatientVO.class),params.toArray());
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, size, count);
    }

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

@@ -1083,159 +1083,214 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            case "0":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1120000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1170000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "3160000":
                res[0] = "1";
                res[1] = "预防保健科";
                break;
            case "1310000":
                res[0] = "2";
                res[1] = "全科医疗科";
                break;
            case "1000001":
                res[0] = "3";
                res[1] = "内科";
                break;
            case "1010000":
                res[0] = "3";
                res[1] = "内科";
                break;
            case "1010200":
                res[0] = "3.01";
                res[1] = "呼吸内科专业";
                break;
            case "1010100":
                res[0] = "3.02";
                res[1] = "消化内科专业";
                break;
            case "1140000":
                res[0] = "3.03";
                res[1] = "神经内科专业";
                break;
            case "1400000":
                res[0] = "3.04";
                res[1] = "心血管内科专业";
                break;
            case "1410000":
                res[0] = "3.04";
                res[1] = "心血管内科专业";
                break;
            case "1210000":
                res[0] = "3.05";
                res[1] = "血液内科专业";
                break;
            case "1010300":
                res[0] = "3.06";
                res[1] = "肾病学专业";
                break;
            case "1220000":
                res[0] = "3.07";
                res[1] = "内分泌专业";
                break;
            case "1010400":
                res[0] = "3.08";
                res[1] = "免疫学专业";
                break;
            case "1020000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1020200":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1260000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1520000":
                res[0] = "4";
                res[1] = "外科";
                break;
            case "1020100":
                res[0] = "4.01";
                res[1] = "普通外科专业";
                break;
            case "1150000":
                res[0] = "4.02";
                res[1] = "神经外科专业";
                break;
            case "1030000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1031000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1032000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1033000":
                res[0] = "4.03";
                res[1] = "骨科专业";
                break;
            case "1020300":
                res[0] = "4.04";
                res[1] = "泌尿外科专业";
                break;
            case "1020400":
                res[0] = "4.05";
                res[1] = "胸外科专业";
                break;
            case "1250000":
                res[0] = "4.06";
                res[1] = "心脏大血管外科专业";
                break;
            case "1300000":
                res[0] = "4.06";
                res[1] = "心脏大血管外科专业";
                break;
            case "1040000":
                res[0] = "5";
                res[1] = "妇产科";
                break;
            case "1050000":
                res[0] = "7";
                res[1] = "儿科";
                break;
            case "1510000":
                res[0] = "8";
                res[1] = "小儿外科";
                break;
            case "1090000":
                res[0] = "10";
                res[1] = "眼科";
                break;
            case "1100000":
                res[0] = "11";
                res[1] = "耳鼻咽喉科";
                break;
            case "1110000":
                res[0] = "12";
                res[1] = "口腔科";
                break;
            case "1160000":
                res[0] = "13";
                res[1] = "皮肤科";
                break;
            case "1230000":
                res[0] = "14";
                res[1] = "医疗美容科";
                break;
            case "1000002":
                res[0] = "15";
                res[1] = "精神科";
                break;
            case "3150000":
                res[0] = "16";
                res[1] = "传染科";
                break;
            case "1200000":
                res[0] = "19";
                res[1] = "肿瘤科";
                break;
            case "1190006":
                res[0] = "20";
                res[1] = "急诊医学科";
                break;
            case "1190007":
                res[0] = "20";
                res[1] = "急诊医学科";
                break;
            case "1280000":
                res[0] = "21";
                res[1] = "康复医学科";
                break;
            case "1130100":
                res[0] = "26";
                res[1] = "麻醉科";
                break;
            case "1130400":
                res[0] = "27";
                res[1] = "疼痛科";
                break;
            case "1400400":
                res[0] = "28";
                res[1] = "重症医学科";
                break;
            case "2070000":
                res[0] = "31";
                res[1] = "病理科";
                break;
            case "1020600":
                res[0] = "32.09";
                res[1] = "介入放射学专业";
                break;
            case "1240000":
                res[0] = "32.1";
                res[1] = "放射治疗专业";
                break;
            case "1080000":
                res[0] = "50";
                res[1] = "中医科";
                break;
            case "1060000":
                res[0] = "50.12";
                res[1] = "老年病科专业";
                break;
            default:
                res[0] = "1";
                res[1] = "预防保健科";
        }
        return  res;
    }
@@ -1246,12 +1301,18 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        switch (status) {
            case "-1":
                res = "0";
                break;
            case "0":
                res = "1";
                break;
            case "1":
                res = "1";
                break;
            case "2":
                res = "1";
                break;
            default:
                res = "";
        }
        return res;
    }
@@ -1290,96 +1351,127 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            case "1303":
                res[0] = "243";
                res[1] = "主管药师";
                break;
            case "1304":
                res[0] = "243";
                res[1] = "主管药师";
                break;
            case "1101":
                res[0] = "231";
                res[1] = "主任医师";
                break;
            case "065":
                res[0] = "231";
                res[1] = "主任医师";
                break;
            case "1201":
                res[0] = "232";
                res[1] = "副主任医师";
                break;
            case "067":
                res[0] = "232";
                res[1] = "副主任医师";
                break;
            case "1301":
                res[0] = "233";
                res[1] = "主治医师";
                break;
            case "066":
                res[0] = "233";
                res[1] = "主治医师";
                break;
            case "1310":
                res[0] = "233";
                res[1] = "主治医师";
                break;
            case "1401":
                res[0] = "234";
                res[1] = "医师";
                break;
            case "061":
                res[0] = "234";
                res[1] = "医师";
                break;
            case "1501":
                res[0] = "235";
                res[1] = "医士";
                break;
            case "1103":
                res[0] = "241";
                res[1] = "主任药师";
                break;
            case "1104":
                res[0] = "241";
                res[1] = "主任药师";
                break;
            case "1203":
                res[0] = "242";
                res[1] = "副主任药师";
                break;
            case "1403":
                res[0] = "244";
                res[1] = "药师";
                break;
            case "1404":
                res[0] = "244";
                res[1] = "药师";
                break;
            case "1503":
                res[0] = "245";
                res[1] = "药士";
                break;
            case "1102":
                res[0] = "251";
                res[1] = "主任护师";
                break;
            case "1204":
                res[0] = "252";
                res[1] = "副主护师";
                break;
            case "1302":
                res[0] = "253";
                res[1] = "主管护师";
                break;
            case "1402":
                res[0] = "254";
                res[1] = "护师";
                break;
            case "1502":
                res[0] = "255";
                res[1] = "护士";
                break;
            case "1107":
                res[0] = "261";
                res[1] = "主任技师";
                break;
            case "1207":
                res[0] = "262";
                res[1] = "副主任技师";
                break;
            case "1307":
                res[0] = "263";
                res[1] = "主管技师";
                break;
            case "056":
                res[0] = "263";
                res[1] = "主管技师";
                break;
            case "1407":
                res[0] = "264";
                res[1] = "技师";
                break;
            case "006":
                res[0] = "264";
                res[1] = "技师";
                break;
            case "053":
                res[0] = "264";
                res[1] = "技师";
                break;
            case "1202":
                res[0] = "252";
                res[1] = "副主护师";
                break;
            default:
                res[0] = "0";
                res[1] = "未知";

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -10,19 +10,16 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
import com.yihu.utils.security.MD5;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by Trick on 2019/8/21.
@@ -85,7 +82,7 @@ public class WlyyBusinessService {
            param.put("title","协同门诊消息");
            param.put("type",500);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyySendMes",param);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyySendMes",param,null);
            if(rs!=null){
                return true;
            }
@@ -108,7 +105,7 @@ public class WlyyBusinessService {
            param.put("type",500);
            param.put("relationCode",outPatientId);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyReadMes",param);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyReadMes",param,null);
            if(rs!=null){
                return true;
            }
@@ -126,41 +123,97 @@ public class WlyyBusinessService {
        JSONObject param = new JSONObject();
        param.put("idCard",idCard);
        JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyCheckSignFamily",param);
        JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyCheckSignFamily",param,null);
        if(rs!=null){
            return true;
        }
        return false;
    }
    
    public String getPatientCodeByWlyyIdcard(String idcard) {
    /**
     * 根据身份证获取i健康居民信息
     * @param idcard
     * @return
     */
    public String getPatientCodeByWlyyIdcard(String idcard) throws Exception {
        BasePatientDO patientDO =  basePatientDao.findByIdcardAndDel(idcard,"1");
        String result = "";
        if(patientDO == null){
            /**
             * todo 调用i健康接口获取居民信息
             */
    
            Map<String,String> params = new HashMap<>();
            params.put("idcard",idcard);
    
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyGetPatient",null,params);
            if(rs!=null){
                Integer status = rs.getInteger("status");
                if(200 == status){
                    JSONObject data = rs.getJSONObject("data");
                    BasePatientDO patient = new BasePatientDO();
                    String salt = UUID.randomUUID().toString().substring(0,5);
                    String mobile = data.getString("mobile");
                    String pw = null;
    
                    if(StringUtils.isNotBlank(mobile)){
                        pw = mobile.substring(mobile.length()-6);
                    }else{
                        pw = idcard.substring(idcard.length()-6);
                    }
    
                    patient.setIdcard(idcard);
                    patient.setName(data.getString("name"));
                    patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                    patient.setSalt(salt);
                    patient.setMobile(mobile);
                    patient.setDel("1");
                    patient.setEnabled(1);
                    patient.setLocked(0);
                    patient.setCreateTime(new Date());
                    patient.setUpdateTime(new Date());
                    patient.setBirthday(DateUtil.strToDate(data.getString("birthday"),"yyyyMMdd"));
                    patient = basePatientDao.save(patient);
                    result = patient.getId();
                }else{
                    throw new Exception("请求i健康接口，获取居民信息失败");
                }
            }
        }else{
        
            result =  patientDO.getId();
        }
        return patientDO.getId();
        return result;
    }
    
    
    /**
     * (健康咨询)转发消息
     * @param senderIdcard
     * @param reciverIdcard
     * @param messageids
     * @param title
     * @param sessionType
     * @return
     * @throws Exception
     */
    public Boolean wlyyMessageForward(String senderIdcard, String reciverIdcard, String messageids, String title, String sessionType) throws Exception {
    
        Map<String,String> params = new HashMap<>();
        params.put("senderIdcard",senderIdcard);
        params.put("reciverIdcard",reciverIdcard);
        params.put("messageids",messageids);
        params.put("title",title);
        params.put("sessionType",sessionType);
        JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyMessageForward",null,params);
        if(rs!=null){
            Integer status = rs.getInteger("status");
            if(200 == status){
                return true;
            }else{
                return false;
            }
        }
        return false;
    }
//    public String getPatientInfo(String ){
//        List<NameValuePair> params = new ArrayList<>();
//        params.add(new BasicNameValuePair("clientId", getClientId()));
//        ClientDetails clientDetails = clientDetailsService.loadClientByClientId(getClientId());
//        params.add(new BasicNameValuePair("clientSecret", clientDetails.getClientSecret()));
//        params.add(new BasicNameValuePair("code", username));
//        params.add(new BasicNameValuePair("openid", getOpenid()));
//        String res = null;
//        try{
//            res = httpClientUtil.post(getSynPath(getWechatId()), params, "UTF-8");
//        }catch (Exception e){
//            logger.error("远程请求i健康用户信息异常：" + e.getMessage());
//            return users;
//        }
//    }
    
    /**
     * 根据居民CODE换取居民请求秘钥
@@ -176,9 +229,10 @@ public class WlyyBusinessService {
        if(basePatientDO != null){
            idcard = basePatientDO.getIdcard();
    
            JSONObject param = new JSONObject();
            param.put("idcard",idcard);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyGetPatientAccetokenByIdcard",param);
            Map<String,String> params = new HashMap<>();
            params.put("idcard",idcard);
            
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyGetPatientAccetokenByIdcard",null,params);
            if(rs!=null){
                Integer status = rs.getInteger("status");
                if(200 == status){

business/base-service/src/main/java/com/yihu/jw/wlyy/wlyyhttp/WlyyHttpService.java

@@ -32,7 +32,13 @@ public class WlyyHttpService {
    @Autowired
    private HttpClientUtil httpClientUtil;
    public JSONObject sendWlyyMes(String configId,JSONObject param) {
    /**
     * @param configId 配置ID
     * @param param key为param,的参数
     * @param mapParams map形式的传参
     * @return
     */
    public JSONObject sendWlyyMes(String configId,JSONObject param,Map<String,String> mapParams) {
        try{
@@ -50,7 +56,20 @@ public class WlyyHttpService {
            if (status == 10000) {
                //设置入参
                List<NameValuePair> p = new ArrayList<>();
                p.add(new BasicNameValuePair("param", param.toJSONString()));
                //组装key为param的入参
                if(param != null){
                    p.add(new BasicNameValuePair("param", param.toJSONString()));
                }
                //组装map形式的传参
                if(mapParams!= null && !mapParams.keySet().isEmpty()){
                    for (String paramkey:mapParams.keySet()){
                        p.add(new BasicNameValuePair(paramkey, mapParams.get(paramkey)));
                    }
                }
                //设置头部
                token = rsjson.getJSONObject("result").getString("accesstoken");

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1604,7 +1604,6 @@ public class ImService {
		sql += " ORDER BY a.czrq desc limit "+page * pagesize+","+pagesize+"";
		
		result = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ConsultVO.class));
		
		return result;
	}
	

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

@@ -21,80 +21,87 @@ public class DataUploadJob implements Job {
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("START========DataUploadJob========");
        try {
            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 02：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);
//            //1、获取 JOB 执行区间  执行时间点的前一天  时间点定在每天的 02：00：00 执行,同步前一天的数据
//            String endDate = DateUtil.dateToStr(DateUtil.getNow(),"yyyy-MM-dd")+" 00:00:00";
//            String startDate = DateUtil.dateToStr(DateUtil.getPreDays(DateUtil.getNow(),-1),"yyyy-MM-dd")+" 00:00:00";
//
//            String res = "";
//
//            //2、分步执行需要JOB执行的服务
//            logger.info("START========2.5 网上预约挂号上传开始========");
//            try {
//                res = internetService.upAppointmentOnline(startDate,endDate,null);
//            }catch (Exception e){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                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){
//                e.printStackTrace();
//                logger.error(e.toString());
//            }
//            logger.info("END==========2.11 电子处方_药品明细表结束 ========" + res);
            logger.info("END========DataUploadJob 执行结束========");
@@ -103,4 +110,5 @@ public class DataUploadJob implements Job {
            logger.error("END===ERROE===DataUploadJob,message:"+e.getMessage());
        }
    }
}

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

@@ -1,5 +1,6 @@
package com.yihu.jw.job;
import org.apache.commons.collections.map.HashedMap;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
@@ -7,6 +8,8 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
@@ -28,6 +31,15 @@ public class QuartzHelper {
        }
    }
    public Map<String,Object> getCalendar()throws Exception{
        Map<String,Object> rs = new HashedMap();
        rs.put("JobGroupNames ",scheduler.getJobGroupNames());
        rs.put("SchedulerName ",scheduler.getSchedulerName());
        rs.put("TriggerGroups ",scheduler.getPausedTriggerGroups());
        return rs;
    }
    public void addJob(Class jobClass, String cronString, String jobKey,
                       Map<String, Object> params) throws Exception {
        if (!CronExpression.isValidExpression(cronString)) {

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

@@ -1,6 +1,7 @@
package com.yihu.jw.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -553,4 +554,18 @@ public class BaseController {
        return simplifiedBean;
    }
    protected <J> ObjEnvelop<J> success(J obj){
        return success("success", obj);
    }
    protected <J> ObjEnvelop<J> success(String message, J obj){
        return success(message, 200, obj);
    }
    protected <J> ObjEnvelop<J> success(String message, int status, J obj){
        ObjEnvelop<J> objEnvelop = new ObjEnvelop<>();
        objEnvelop.setMessage(message);
        objEnvelop.setStatus(status);
        objEnvelop.setObj(obj);
        return objEnvelop;
    }
}

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

@@ -8,6 +8,7 @@ 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.restmodel.web.ObjEnvelop;
import com.yihu.jw.service.quota.JobService;
import com.yihu.jw.util.SystemConf;
import com.yihu.jw.web.BaseController;
@@ -68,6 +69,13 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "getCalendar", method = RequestMethod.GET)
    public ObjEnvelop getCalendar() throws Exception{
       return success(quartzHelper.getCalendar());
    }
    @RequestMapping(value = "isExist", method = RequestMethod.GET)
    public String isExist(String taskId) {
        try {

svr/svr-internet-hospital-job/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-internet-hospital-job
    name: svr-internet-hospital-job-yx
  cloud:
    config:
      failFast: true

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

@@ -5,8 +5,8 @@ prescriptionStatus_update_job=0 */2 * * * ?
# 门诊记录过期job，每天1 点触发
prescription_overdue_job=0 0 1 * * ?
#每天2 点触发
data_upload_job=0 0 2 * * ?
#每天13 点触发
data_upload_job=0 0 13 * * ?
#data_upload_25_job=0 0 1 * * ?
#

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -699,10 +699,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	                              @ApiParam(name = "sessionType", value = "原会话的会话类型", defaultValue = "")
	                              @RequestParam(value = "sessionType", required = true) String sessionType
	) throws Exception {
		/**
		 * todo 请求i健康接口发送转发的聊天消息
		 */
		return success("请求成功");
		return success("转发成功",wlyyBusinessService.wlyyMessageForward(senderIdcard,reciverIdcard,messageids,title,sessionType));
	}
	
}

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-internet-hospital
    name: svr-internet-hospital-kk
  cloud:
    config:
      failFast: true