门诊医生工作台开处方功能完善

src/main/java/cn/hnthyy/thmz/service/impl/thmz/OrderStatusChangeServiceImpl.java

@@ -102,7 +102,10 @@ public class OrderStatusChangeServiceImpl implements OrderStatusChangeService {
                 if(mzZdWorkTime!=null){
                     workTime+=mzZdWorkTime.getStartTime()+"-"+mzZdWorkTime.getEndTime();
                 }
-                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您已预约挂号成功，请在就诊前支付，以免影响就诊！\"},\"keyword1\":{\"color\":\"#173177\",\"value\":\"" + mzPatientMi.getName() + "\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keyword3\":{\"color\":\"#173177\",\"value\":\"" + DateUtil.fomart(mzyReqrec.getRequestDay(),"yyyy-MM-dd") + "\"},\"keyword4\":{\"color\":\"#173177\",\"value\":\"" + workTime + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"过就诊时段不交费，将无法进行就诊。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"bFM8MrBxD44otLayuBjXHoTjEtqrw95_Cej--tNdFDE\",\"touser\":\"\",\"url\":\"\"}", new Date());
+                //进行挂号支付的链接
+                String params = mzyReqrec.getPatientId()+"_"+mzyReqrec.getTimes();
+                String url="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=payClinicAppointmentOrder_"+params+"&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
+                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您已预约挂号成功，请在就诊前支付，以免影响就诊！\"},\"keyword1\":{\"color\":\"#173177\",\"value\":\"" + mzPatientMi.getName() + "\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"keyword3\":{\"color\":\"#173177\",\"value\":\"" + DateUtil.fomart(mzyReqrec.getRequestDay(),"yyyy-MM-dd") + "\"},\"keyword4\":{\"color\":\"#173177\",\"value\":\"" + workTime + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"过就诊时段不交费，将无法进行就诊。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"bFM8MrBxD44otLayuBjXHoTjEtqrw95_Cej--tNdFDE\",\"touser\":\"\",\"url\":\""+url+"\"}", new Date());
                 return;
             }
 
@@ -125,10 +128,7 @@ public class OrderStatusChangeServiceImpl implements OrderStatusChangeService {
                         doctorName = employee.getEmployeeName();
                     }
                 }
-                //进行挂号支付的链接
-                String params = mzyReqrec.getPatientId()+"_"+mzyReqrec.getTimes();
-                String url="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=payClinicAppointmentOrder_"+params+"&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
-                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您已经挂号成功,请您及时前往医生诊室就诊，详情如下:\"},\"deptname\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"doctorname\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"就诊地点 : " + zdUnitCode.getOfficePos() + "。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"ctMSV4jb3aHYJS0hOjTl8h9Nyrj-46XTLMnUFn6eWh8\",\"touser\":\"\",\"url\":\""+url+"\"}", new Date());
+                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(), "{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"您好，您已经挂号成功,请您及时前往医生诊室就诊，详情如下:\"},\"deptname\":{\"color\":\"#173177\",\"value\":\"" + zdUnitCode.getName() + "\"},\"doctorname\":{\"color\":\"#173177\",\"value\":\"" + doctorName + "\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"就诊地点 : " + zdUnitCode.getOfficePos() + "。\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"ctMSV4jb3aHYJS0hOjTl8h9Nyrj-46XTLMnUFn6eWh8\",\"touser\":\"\",\"url\":\"\"}", new Date());
                 return;
             }