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/prescription/service/PrescriptionService.java

@@ -5113,37 +5113,107 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            logger.info("doctorRefund:outpatientId="+outpatientId);
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        } else if("patientCancel".equalsIgnoreCase(titelType)) {
            if ("9".equals(type)) {
                contentMsg = "您发起的图文复诊已被您取消。由于订单取消将不做扣费处理。";
                first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已被您取消，您可重新发起";
            }
            if ("16".equals(type)) {
                contentMsg =  "您发起的视频复诊已被您取消。由于订单取消将不做扣费处理。";
                first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已被您取消，您可重新发起";
            }
            if ("1".equals(type)) {
                contentMsg =  "您发起的图文咨询已被您取消。由于订单取消将不做扣费处理。";
                first = outpatientDO.getConsumerName() + "，您好！您的图文咨询已被您取消，您可重新发起";
            }
            if ("17".equals(type)) {
                contentMsg = "您发起的视频咨询已被您取消。由于订单取消将不做扣费处理。";
                first = outpatientDO.getConsumerName() + "，您好！您的视频咨询已被您取消，您可重新发起";
            }
            if ("12".equals(type)) {
                return;
            WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("isCloseRefund");
            if (hospitalSysDictDO!=null){
                if (hospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
                    if ("9".equals(type)) {
                        contentMsg = "您发起的图文复诊已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已被您取消，您可重新发起";
                    }
                    if ("16".equals(type)) {
                        contentMsg =  "您发起的视频复诊已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已被您取消，您可重新发起";
                    }
                    if ("1".equals(type)) {
                        contentMsg =  "您发起的图文咨询已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文咨询已被您取消，您可重新发起";
                    }
                    if ("17".equals(type)) {
                        contentMsg = "您发起的视频咨询已被您取消。已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频咨询已被您取消，您可重新发起";
                    }
                    if ("12".equals(type)) {
                        return;
                    }
                }else {
                    if ("9".equals(type)) {
                        contentMsg = "您发起的图文复诊已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已被您取消，您可重新发起";
                    }
                    if ("16".equals(type)) {
                        contentMsg =  "您发起的视频复诊已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已被您取消，您可重新发起";
                    }
                    if ("1".equals(type)) {
                        contentMsg =  "您发起的图文咨询已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文咨询已被您取消，您可重新发起";
                    }
                    if ("17".equals(type)) {
                        contentMsg = "您发起的视频咨询已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频咨询已被您取消，您可重新发起";
                    }
                    if ("12".equals(type)) {
                        return;
                    }
                }
            }else {
                if ("9".equals(type)) {
                    contentMsg = "您发起的图文复诊已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已被您取消，您可重新发起";
                }
                if ("16".equals(type)) {
                    contentMsg =  "您发起的视频复诊已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已被您取消，您可重新发起";
                }
                if ("1".equals(type)) {
                    contentMsg =  "您发起的图文咨询已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的图文咨询已被您取消，您可重新发起";
                }
                if ("17".equals(type)) {
                    contentMsg = "您发起的视频咨询已被您取消。请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的视频咨询已被您取消，您可重新发起";
                }
                if ("12".equals(type)) {
                    return;
                }
            }
            logger.info("patientCancel诊查费支付成功推送模板消息:outpatientId="+outpatientId);
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        }else if("systemCancelRemind".equalsIgnoreCase(titelType)){
            //超过24小时未接诊，系统取消
            if ("9".equals(type)) {
                contentMsg = "由于订单取消将不做扣费处理。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您的图文复诊因超过24小时未接诊已自动取消图文咨询。";
            }
            if ("16".equals(type)) {
                contentMsg = "由于订单取消将不做扣费处理。如需退款（18元）请到门诊收费处退款。";
                first = outpatientDO.getConsumerName() + "，您好！您的视频复诊因超过24小时未接诊已自动取消视频咨询。";
            WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("isCloseRefund");
            if (hospitalSysDictDO!=null){
                if (hospitalSysDictDO.getDictValue().equalsIgnoreCase("1")){
                    if ("9".equals(type)) {
                        contentMsg = "您发起的图文复诊已取消，已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文复诊因超过24小时未接诊已自动取消图文咨询。";
                    }
                    if ("16".equals(type)) {
                        contentMsg = "您发起的视频复诊已取消，已支付的18元将原路退回，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频复诊因超过24小时未接诊已自动取消视频咨询。";
                    }
                }else {
                    if ("9".equals(type)) {
                        contentMsg = "您发起的图文复诊已取消，请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的图文复诊因超过24小时未接诊已自动取消图文咨询。";
                    }
                    if ("16".equals(type)) {
                        contentMsg = "您发起的视频复诊已取消，请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                        first = outpatientDO.getConsumerName() + "，您好！您的视频复诊因超过24小时未接诊已自动取消视频咨询。";
                    }
                }
            }else {
                if ("9".equals(type)) {
                    contentMsg = "您发起的图文复诊已取消，请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的图文复诊因超过24小时未接诊已自动取消图文咨询。";
                }
                if ("16".equals(type)) {
                    contentMsg = "您发起的视频复诊已取消，请前往收费窗口进行退款，如有问诊需求，可重新发起或到医院门急诊就诊。";
                    first = outpatientDO.getConsumerName() + "，您好！您的视频复诊因超过24小时未接诊已自动取消视频咨询。";
                }
            }
            logger.info("系统取消接诊入参:outpatientId="+outpatientId);
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        } else if ("payRemind".equalsIgnoreCase(titelType)) {
@@ -15146,10 +15216,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
    }
    public String getDoctorAppointDate(String doctorId){
    public String getDoctorInfoByIdcard(String doctorId){
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctorId);
        if (doctorDO!= null){
            String res = ykyyService.get_app_date(doctorDO.getYktCode(),"0");
            String res = ykyyService.get_doctorinfo_by_idcard(doctorDO.getIdcard());
            return res;
        }
        return null;

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

@@ -1182,6 +1182,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                "  schedule_item_code as \"scheduleItemCode\",\n" +
                "  to_char(service_start_date,'YYYY-MM-DD hh24:mi:ss') as \"serviceStartDate\",\n" +
                "  to_char(service_end_date,'YYYY-MM-DD hh24:mi:ss') as \"serviceEndDate\",\n" +
                "  to_char(create_time,'YYYY-MM-DD hh24:mi:ss') as \"createTime\",\n" +
                "  patient_name as \"patientName\",\n" +
                "  patient_card as \"patientCard\",\n" +
                "  patient_phone as \"patientPhone\",\n" +

business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java

@@ -946,6 +946,24 @@ public class YkyyService {
    }
    /**
     * 获取医生信息
     *
     * @param idcard 身份证
     * @return
     */
    public String get_doctorinfo_by_idcard(String idcard){
        String response="";
        long timespan = System.currentTimeMillis();
        String sign = MD5.md5Hex(idcard+timespan+"HXYKT123!@#");
        String url=yktUrl+"doctor/get_doctorinfo_by_idcard?idcard="+idcard+"&timespan="+timespan+"&token="+sign;
        logger.info("获取可预约日期列表="+url);
        response = httpClientUtil.get(url,"UTF-8");
        logger.info("获取可预约日期列表"+response);
        return response;
    }
    /**
     * 获取可预约日期列表
     *

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorDO.java

@@ -306,16 +306,6 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    private Integer mark;//数据导出权限   1是 0否
    private String yktCode;//眼科通医生编码
    public String getYktCode() {
        return yktCode;
    }
    public void setYktCode(String yktCode) {
        this.yktCode = yktCode;
    }
    public Integer getMark() {
        return mark;
    }

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

@@ -3715,10 +3715,24 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @PostMapping("/getDoctorAppointDate")
    @ApiOperation(value = "获取某个医生排班", notes = "获取某个医生排班")
    public Envelop getDoctorAppointDate(
            @ApiParam(name = "docCode", value = "docCode")
            @RequestParam(value = "docCode", required = false) String docCode,
            @ApiParam(name = "hospitalType", value = "hospitalType(医院（0：思北 1：五缘）)")
            @RequestParam(value = "hospitalType", required = false) String hospitalType) {
        try {
            return success("操作成功", ykyyService.get_app_date(docCode,hospitalType));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping("/getDoctorInfoByIdcard")
    @ApiOperation(value = "获取医生信息", notes = "获取医生信息")
    public Envelop getDoctorInfoByIdcard(
            @ApiParam(name = "doctorId", value = "doctorId")
            @RequestParam(value = "doctorId", required = false) String doctorId) {
        try {
            return success("操作成功", prescriptionService.getDoctorAppointDate(doctorId));
            return success("操作成功", prescriptionService.getDoctorInfoByIdcard(doctorId));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }