三院优化开发

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

@@ -30,5 +30,5 @@ public interface PrescriptionExpressageDao extends JpaRepository<WlyyPrescriptio
    List<WlyyPrescriptionExpressageDO> findByOutpatientIdAndOneSelfPick(String outpatientId);
    @Query(value = "select p.* from wlyy_prescription_expressage p where p.outpatient_id=?1 order by p.create_time desc limit 1",nativeQuery = true)
    WlyyPrescriptionExpressageDO findByPrescriptionCode(String prescriptionCode);
    WlyyPrescriptionExpressageDO findByOupatientId(String outpatientId);
}

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

@@ -261,7 +261,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            //病历
            JSONArray emrArray = dsyyEntranceService.selectHistoryEmrFromEntrance(patNo,registerSn);
            for (int z=0;z<emrArray.size();z++){
                JSONObject object = emrArray.getJSONObject(i);
                JSONObject object = emrArray.getJSONObject(z);
                String PATIENT = object.getString("PATIENT");
                String OPID = object.getString("OPID");
                String res = selectHistoryEmrRecord(PATIENT,OPID);

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

@@ -5682,16 +5682,21 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    return;
                }
            } else if ("paySuccess".equalsIgnoreCase(titelType)) {
                String title = "";
                if ("9".equals(type)) {
                    title = "图文复诊";
                    contentMsg = "您已成功发起图文复诊，请耐心等待医生接单。如长时间未接诊，建议选择其他医生";
                    first = outpatientDO.getConsumerName() + "，您好！您已成功发起图文复诊";
                }else if ("16".equals(type)) {
                    title = "视频复诊";
                    contentMsg =  "您已成功发起视频复诊，请耐心等待医生接单。如长时间未接诊，建议选择其他医生";
                    first = outpatientDO.getConsumerName() + "，您好！您已成功发起视频复诊";
                }else if ("1".equals(type)) {
                    title = "图文咨询";
                    contentMsg =  "您已成功发起图文咨询，请耐心等待医生接单。如长时间未接诊，建议选择其他医生";
                    first = outpatientDO.getConsumerName() + "，您好！您已成功发起图文咨询";
                }else if ("17".equals(type)) {
                    title = "视频咨询";
                    contentMsg = "您已成功发起视频咨询，请耐心等待医生接单。如长时间未接诊，建议选择其他医生";
                    first = outpatientDO.getConsumerName() + "，您好！您已成功发起视频咨询";
                }else {
@@ -5699,6 +5704,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
                logger.info("paySuccess诊查费支付成功推送模板消息:outpatientId="+outpatientId);
                msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
                if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
                    sendSms(doctorDO.getMobile(),"医生您好，患者"+outpatientDO.getPatientName()+"向您发起了"+title+",请及时前往互联网医院查看并答复。","2");
                }
            }else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
                //开具处方后向患者发送支付提醒
                first = outpatientDO.getConsumerName() + "，您好！ 医生已为您开具处方，请及时支付。";
@@ -9108,6 +9116,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        try {
            JSONObject data = new JSONObject();
            BasePatientDO patient = basePatientDao.findById(outpatient.getPatient()).orElse(null);
            BaseDoctorDO doctor = baseDoctorDao.findById(outpatient.getDoctor()).orElse(null);
            String title = "";
            //1.在线复诊2.协同门诊
            if ("2".equals(outpatient.getOutpatientType())) {
@@ -9181,9 +9190,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)) {
                    ykyyService.pushNotificationToYktPatient(patient.getYktId(), systemMessageDO.getTitle(), data.get("msg").toString());
                }
                if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
                    sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了"+title+",请及时前往互联网医院查看并答复。","2");
                }
            } else if ("1".equals(outpatient.getOutpatientType()))  {        //在线复诊
                //1.图文 2.视频
                if ("1".equals(outpatient.getType())) {
@@ -9209,8 +9216,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                wlyyHttpLogDao.save(wlyyHttpLogDO);
                            }
                        }
                    }else  if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
                        sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了图文问诊,请及时前往互联网医院查看并答复。","2");
                    }
                } else {
                    systemMessageDO.setTitle("视频复诊预约成功");
@@ -12207,6 +12212,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    if (null!=businessOrderDO){
                        businessOrders.add(businessOrderDO);
                    }
                    //物流信息
                    WlyyPrescriptionExpressageDO expressageDO = prescriptionExpressageDao.findByOupatientId(vo.getOutpatientId());
                    if (expressageDO!=null){
                        vo.setOneselfPickupFlg(expressageDO.getOneselfPickupFlg());
                    }
                }
            }