Merge branch 'main' of suhaiwen/wlyy2.0 into dev

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

@@ -5792,10 +5792,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (consultTeamDo!=null){
            BaseDoctorDO doctorDO = baseDoctorDao.findById(consultTeamDo.getDoctor());
            BasePatientDO patientDO = basePatientDao.findById(consultTeamDo.getPatient());
            if (consultTeamDo.getType().equals("17")){
            if (consultTeamDo.getType()==17){
                type = "17";
                msg = patientDO.getName() + "，您好！您有一个视频咨询订单待支付，请及时支付。点击完成支付，如您已支付请忽略本条信息。";
            }else if (consultTeamDo.getType().equals("1")){
            }else if (consultTeamDo.getType()==1){
                type = "1";
                msg = patientDO.getName() + "，您好！您有一个图文咨询订单待支付，请及时支付。点击完成支付，如您已支付请忽略本条信息。";
            }

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

@@ -413,7 +413,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		consult.setImages(images);
		// 设置咨询语音URL
		consult.setVoice(voice);
		consult.setDoctor(doctor);
		consult.setPatient(patient);
		// 保存到数据库
//		int res = 0;
//		JSONArray dts = null;
@@ -441,7 +442,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					data.put("question",symptoms);
					data.put("type",type);
					String msg= "";
				/*	prescriptionService.sendWxTemplateMsg(wxId,"",consult,type+"","payRemind","");*/
					/*prescriptionService.sendWxTemplateMsg(wxId,"",consult,type+"","payRemind","");*/
					prescriptionService.saveInquirySystemMessage(null,consult);
					data.put("msg",msg);
					systemMessageDO.setData(data.toString());