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

@@ -4158,20 +4158,22 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }
            if ("1".equals(type)) {
                contentMsg = "您有一个图文咨询订单待支付，点击完成支付，如您已支付请忽略本条信息";
                first = consPatientDO.getName() + "，您好！您有一个图文咨询订单待支付，请及时支付。";
                if (StringUtils.isNotBlank(outpatientId)){
                    msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
                    first = outpatientDO.getConsumerName() + "，您好！您有一个图文咨询订单待支付，请及时支付。";
                }else{
                    msgUrl="/ims-wx/index.html#/chatRoom?type=1&consultCode="+consultTeam.getConsult();
                    first = consPatientDO.getName() + "，您好！您有一个图文咨询订单待支付，请及时支付。";
                }
                logger.info("图文咨询订单待支付微信消息模板推送开始");
            } else if ("17".equals(type)) {
                contentMsg = "您有一个视频咨询订单待支付，点击完成支付，如您已支付请忽略本条信息";
                first =  consPatientDO.getName() + "，您好！您有一个视频咨询订单待支付，请及时支付。";
                if (StringUtils.isNotBlank(outpatientId)){
                    msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
                    first =  outpatientDO.getConsumerName() + "，您好！您有一个视频咨询订单待支付，请及时支付。";
                }else{
                    msgUrl="/ims-wx/index.html#/chatRoom?type=1&consultCode="+consultTeam.getConsult();
                    first =  consPatientDO.getName() + "，您好！您有一个视频咨询订单待支付，请及时支付。";
                }
                logger.info("视频咨询订单待支付微信消息模板推送开始");
            }
@@ -4196,7 +4198,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                  logger.info("视频问诊已接诊提醒微信模板消息发送开始");
              }
              if ("17".equals(type)) {
                  first = consDoctorDO.getName() + consDoctorDO.getJobTitleName() + "医生已向您发起视频通话邀请，请点击详情进入视频诊室。";
                  first = doctorDO.getName() + doctorDO.getJobTitleName() + "医生已向您发起视频通话邀请，请点击详情进入视频诊室。";
                  contentMsg = "您的视频咨询已开始，错过将重新排队";
                  remark = "点击消息进入视频诊室接听视频通话，开始视频复诊。";
                  if (StringUtils.isNotEmpty(outpatientId)){
@@ -5366,6 +5368,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort;
            }else{
                sql += " and d.del='1' order by d.consult_status desc nulls last ,evaluate.score desc nulls last ,a.total " + consutlSort;
                sql+=" NULLS LAST,\n" +
                        "\tD.id DESC";
            }
        }else {
            sql += " and d.del='1' order by d.consult_status DESC ,evaluate.score desc,a.total " + consutlSort;
@@ -6714,7 +6718,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                //1.图文 2.视频 3家医
                if ("1".equals(outpatient.getType())) {
                    systemMessageDO.setTitle("图文咨询");
                    systemMessageDO.setType("4");
                    systemMessageDO.setType("18");
                    if (payFlag){
                        saveInquirySystemMessage(outpatient,null);
                    }
@@ -6807,7 +6811,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        systemMessageDO.setType("11");
        JSONObject data = new JSONObject();
        if (outpatient!=null){
            if("1"==outpatient.getOutpatientType()){
            if("1".equalsIgnoreCase(outpatient.getOutpatientType())){
                if ("1".equals(outpatient.getType())) {
                    type = "9";
                    msg = outpatient.getPatientName() + "，您好！您有一个图文复诊订单待支付，请及时支付。点击完成支付，如您已支付请忽略本条信息。";
@@ -6815,7 +6819,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    type = "16";
                    msg = outpatient.getPatientName() + "，您好！您有一个视频复诊订单待支付，请及时支付。点击完成支付，如您已支付请忽略本条信息。";
                }
            }else if ("3"==outpatient.getOutpatientType()){
            }else if ("3".equalsIgnoreCase(outpatient.getOutpatientType())){
                if ("1".equals(outpatient.getType())) {
                    type = "1";
                    msg = outpatient.getPatientName() + "，您好！您有一个图文咨询订单待支付，请及时支付。点击完成支付，如您已支付请忽略本条信息。";

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

@@ -809,4 +809,17 @@ public class PrescriptionStatusUpdateService {
        }
        return msgReurn;
    }
    public String finishOldConsult(String consult){
        int resutl = imService.finish(consult,"admin",2);
        //医生未回复可以退费
        try {
            businessOrderService.consultRefund(consult,wechatId);
        }catch (Exception e){
            e.printStackTrace();
            return  "failed";
        }
        return "success";
    }
}

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

@@ -701,4 +701,12 @@ public class JobController extends BaseController {
        return prescriptionStatusUpdateService.cancelAllandSendMessage(day);
    }
    @RequestMapping(value = "finishOldConsult", method = RequestMethod.GET)
    @ApiOperation("取消旧的咨询")
    public String finishOldConsult(String consult){
        return success(prescriptionStatusUpdateService.finishOldConsult(consult));
    }
}