同城物流对接

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

@@ -158,6 +158,7 @@ import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -3657,7 +3658,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param size
     * @return
     */
    public MixEnvelop findExpressageList(String status, String oneselfPickupFlg, String nameKey, String startTime, String endTime, Integer page, Integer size, String wxId,String patientName) {
    public MixEnvelop findExpressageList(String status, String oneselfPickupFlg, String nameKey, String startTime, String endTime, Integer page, Integer size, String wxId,String patientName,Integer type) {
        String totalSql = "SELECT " +
                " COUNT(1) AS \"total\" " +
                " FROM " +
@@ -3675,6 +3676,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNotBlank(nameKey)) {
            totalSql += " AND e.name like '%" + nameKey + "%' ";
        }
        if (type!=null)  {
            totalSql += " AND e.type ='"+type+"' ";
        }
        if (StringUtils.isNotBlank(patientName)) {
            totalSql += " AND o.patient_name like '%" + patientName + "%' ";
        }
@@ -3741,6 +3745,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        sql = sql + " e.name as \"name\", " +
                " e.oneself_pickup_flg AS \"oneselfPickupFlg\", " +
                " e.type AS \"type\", " +
                " o.id AS \"outpatientId\", " +
                " o.icd10_name AS \"icd10Name\", " +
                " o.medical_state AS \"medicalState\", " +
@@ -3771,6 +3776,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNotBlank(patientName)) {
            sql += " AND o.patient_name like '%" + patientName + "%' ";
        }
        if (type!=null) {
            sql += " AND e.type ='"+type+"' ";
        }
        if (StringUtils.isNotBlank(startTime)) {
            if ("xm_ykyy_wx".equals(wxId)) {
                if (flag){
@@ -17144,7 +17152,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            expressageDO.setOneselfPickupFlg(0);
            expressageDO.setUpdateTime(new Date());
        }else {
            res = sfUtils.createorder(realOrder);
            if (StringUtils.isNoneBlank(expressageDO.getMailno())){
                throw new Exception("已下单，请勿重新下单");
            }else {
                res = sfUtils.createorder(realOrder);
            }
        }
        return res;
    }
@@ -17226,6 +17238,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                flag = false;
            }
        }
        LocalDate today = LocalDate.now();
        int dayOfWeek = today.getDayOfWeek().getValue();
        System.out.println(dayOfWeek+"=====================");
        return flag;
    }

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

@@ -3,7 +3,6 @@ package com.yihu.jw.hospital.prescription.service.entrance.util;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cronutils.utils.DateUtils;
import com.sfjswl.util.SftcwlSignature;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
@@ -78,6 +77,7 @@ public class SFUtils {
//    private static final String dev_secret = "f66e3a3af7ef8184434ee75e715e7762";// 68ab9d9742d9312764e224793f495d79 正式 开发者密钥（开放平台）
//    private static final String shop_id = "3243279847393";//店铺ID
    private static final String order_source = "中山医院";//订单接入来源 支持中文字符串值，其他来源商户系统可自定义。如：滴滴、蜂鸟等）
    //创建订单(店铺)
    public String createorder(String realOrder) throws Exception {
        String ret = null;
@@ -153,6 +153,7 @@ public class SFUtils {
            json.put("version",version);
            json.put("receive",receive);
            json.put("payment_method",2);
            json.put("remark",prescriptionDO.getPatientName()+","+prescriptionDO.getRealOrder()+",七号楼一楼门诊药房3号窗口");
            json.put("order_detail",order_detail);
            request = json.toJSONString();
            String sign = SftcwlSignature.sign(json.toJSONString(),dev_id,dev_secret);

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -41,6 +41,7 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.sms.dao.BaseSmsTemplateDao;
import com.yihu.jw.sms.service.ZhongShanSMSService;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.QrcodeUtil;
import com.yihu.jw.util.common.XMLUtil;
@@ -156,6 +157,8 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
    private YlzMedicailRelationDao ylzMedicailRelationDao;
    @Autowired
    private HcyyPrescriptionService hcyyPrescriptionService;
    @Autowired
    private ZhongShanSMSService zhongShanSMSService;
    /**
@@ -1662,6 +1665,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
                    String url=baseUrl+"/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("zsyy",outpatientDO.getDoctor(),title,msg,url);
                }else if(wechatId.equalsIgnoreCase("xm_ykyy_wx")){
                    String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_ykyy_wx",outpatientDO.getDoctor(),title,msg,url);
@@ -1729,6 +1733,21 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
               if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){
                   String url=baseUrl+"/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                   enterpriseService.sendTWMesByDoctor("zsyy",outpatientDO.getDoctor(),title,msg,url);
                   BaseDoctorDO doctorDO = doctorDao.findById(outpatientDO.getDoctor());
                   if (doctorDO!=null){
                       if (StringUtils.isNoneBlank(doctorDO.getMobile())){
                           String content = doctorDO.getName()+"医生，患者"+outpatientDO.getPatientName()+"向您发起了图文问诊，请您及时打开企业微信，进入在线诊疗查看！";
                           int i= zhongShanSMSService.ZhongShangSendSMS(doctorDO.getMobile(),content);
                           WlyyHttpLogDO wlyyHttpLogDO = new WlyyHttpLogDO();
                           wlyyHttpLogDO.setDoctor(outpatientDO.getDoctor());
                           wlyyHttpLogDO.setRequest("");
                           wlyyHttpLogDO.setName(content);
                           wlyyHttpLogDO.setCode(outpatientDO.getId());
                           wlyyHttpLogDO.setCreateTime(new Date());
                           wlyyHttpLogDO.setResponse(i+"");
                           wlyyHttpLogDao.save(wlyyHttpLogDO);
                       }
                   }
               }else if (wechatId.equalsIgnoreCase("xm_ykyy_wx")){
                   String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                   enterpriseService.sendTWMesByDoctor("xm_ykyy_wx",outpatientDO.getDoctor(),title,msg,url);
@@ -1819,6 +1838,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                        String url=baseUrl+"/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("zsyy",outpatientDO.getDoctor(),title,msg,url);
                    }else if (wxId.equalsIgnoreCase("xm_xzzx_wx")){
                        String url="https://ih.xmheart.com/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("xm_xzzx_wx",outpatientDO.getDoctor(),title,msg,url);
@@ -1879,6 +1899,23 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    logger.info("进入无需支付zs"+relationCode+"=="+wxId);
                    String url=baseUrl+"/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("zsyy",outpatientDO.getDoctor(),title,msg,url);
                    logger.info("进入短信发送====");
                    BaseDoctorDO doctorDO = doctorDao.findById(outpatientDO.getDoctor());
                    if (doctorDO!=null){
                        if (StringUtils.isNoneBlank(doctorDO.getMobile())){
                            String content = doctorDO.getName()+"医生，患者"+outpatientDO.getPatientName()+"向您发起了问诊，请您及时打开企业微信，进入在线诊疗查看！";
                            logger.info("进入短信发送开始===="+content);
                            int i= zhongShanSMSService.ZhongShangSendSMS(doctorDO.getMobile(),content);
                            WlyyHttpLogDO wlyyHttpLogDO = new WlyyHttpLogDO();
                            wlyyHttpLogDO.setDoctor(outpatientDO.getDoctor());
                            wlyyHttpLogDO.setRequest("");
                            wlyyHttpLogDO.setName(content);
                            wlyyHttpLogDO.setCode(outpatientDO.getId());
                            wlyyHttpLogDO.setCreateTime(new Date());
                            wlyyHttpLogDO.setResponse(i+"");
                            wlyyHttpLogDao.save(wlyyHttpLogDO);
                        }
                    }
                }else if (wxId.equalsIgnoreCase("xm_xzzx_wx")){
                    String url="https://ih.xmheart.com/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+outpatientDO.getDescription()+"&type=3&id="+outpatientDO.getId();
                    enterpriseService.sendTWMesByDoctor("xm_xzzx_wx",outpatientDO.getDoctor(),title,msg,url);

business/sms-service/src/main/java/com/yihu/jw/sms/service/ZhongShanSMSService.java

@@ -125,7 +125,7 @@ public class ZhongShanSMSService {
		params.add(new BasicNameValuePair("salt",salt));
		params.add(new BasicNameValuePair("sign",sign));
		String res = httpClientUtil.get(url,params,"GBK");
		System.out.println("res==="+res);
		System.out.println("短信发送res==="+res);
		if (StringUtils.isNoneBlank(res)){
			JSONObject object = JSONObject.parseObject(res);
			return object.getInteger("smsCode");

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/RemindDoctorService.java

@@ -8,9 +8,11 @@ import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.sms.service.ZhongShanSMSService;
import com.yihu.jw.util.RemindDoctorJob;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
@@ -47,6 +49,10 @@ public class RemindDoctorService {
    private PrescriptionService prescriptionService;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private ZhongShanSMSService zhongShanSMSService;
    @Autowired
    private WlyyHttpLogDao wlyyHttpLogDao;
@@ -135,15 +141,15 @@ public class RemindDoctorService {
                        String url=baseUrl+"/hlwyy/ims-app-web/#/onlineChat/detail?_rs_title="+wlyyOutpatientDO.getDescription()+"&type=3&id="+wlyyOutpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("zsyy",wlyyOutpatientDO.getDoctor(),title,msg,url);
                        /*int i= zhongShanSMSService.ZhongShangSendSMS(doctorDO.getMobile(),msg);
                        zhongShanSMSService.ZhongShangSendSMS(doctorDO.getMobile(),msg);
                        WlyyHttpLogDO wlyyHttpLogDO = new WlyyHttpLogDO();
                        wlyyHttpLogDO.setDoctor(outpatient.getDoctor());
                        wlyyHttpLogDO.setDoctor(wlyyOutpatientDO.getDoctor());
                        wlyyHttpLogDO.setRequest("");
                        wlyyHttpLogDO.setName(content);
                        wlyyHttpLogDO.setCode(outpatient.getId());
                        wlyyHttpLogDO.setName(msg);
                        wlyyHttpLogDO.setCode(wlyyOutpatientDO.getId());
                        wlyyHttpLogDO.setCreateTime(new Date());
                        wlyyHttpLogDO.setResponse(i+"");
                        wlyyHttpLogDao.save(wlyyHttpLogDO);*/
                        wlyyHttpLogDao.save(wlyyHttpLogDO);
                    }else if(wechatId.equalsIgnoreCase("xm_ykyy_wx")){
                        String url=baseUrl+"/ims-app-web/#/onlineChat/detail?_rs_title="+wlyyOutpatientDO.getDescription()+"&type=3&id="+wlyyOutpatientDO.getId();
                        enterpriseService.sendTWMesByDoctor("xm_ykyy_wx",wlyyOutpatientDO.getDoctor(),title,msg,url);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -880,10 +880,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                         @ApiParam(name = "page", value = "第几页，1开始")
                                         @RequestParam(value = "page", required = false) Integer page,
                                         @ApiParam(name = "size", value = "每页大小")
                                         @RequestParam(value = "size", required = false) Integer size) {
                                         @RequestParam(value = "size", required = false) Integer size,
                                         @ApiParam(name = "type", value = "配送类型1普通快递2同城快递")
                                             @RequestParam(value = "type", required = false) Integer type) {
        try {
            return prescriptionService.findExpressageList(status, oneselfPickupFlg, nameKey, startTime, endTime, page, size, wxId, patientName);
            return prescriptionService.findExpressageList(status, oneselfPickupFlg, nameKey, startTime, endTime, page, size, wxId, patientName,type);
        } catch (Exception e) {
            return failedMixEnvelopException(e);
        }