|
|
@@ -110,8 +110,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
|
|
|
if(!notCovid.contains(mzyRequest.getUnitCode())){
|
|
|
CovidPojo covidPojo = covidPojoMapper.selectLastCovidPojoByIdcard(mzPatientMi.getSocialNo(), mzPatientMi.getPatientId());
|
|
|
if (covidPojo == null) {
|
|
|
- haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(),"{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"很抱歉，您的暂时无法进行挂号，详情如下:\"},\"keyword1\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"挂号失败\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword3\":{\"color\":\"#173177\",\"value\":\"您还未做流行病学调查,请前往填写\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"PEDh0niCG93uQsY5P6XS-J3haoB8sn4Pq-ZSrEZ6gGo\",\"touser\":\"\",\"url\":\""+lxbdcwjUrl+mzyReqrec.getPatientId()+"\"}",new Date());
|
|
|
- throw new MzException("当前挂号的病人还未做流行病调查报告,请告知病人及时前往填写！");
|
|
|
+ haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(),"{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"很抱歉，您的暂时无法进行挂号，详情如下:\"},\"keyword1\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"挂号失败\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword3\":{\"color\":\"#173177\",\"value\":\"您还未做新型冠状病毒感染流行病学史问卷,请前往填写\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"PEDh0niCG93uQsY5P6XS-J3haoB8sn4Pq-ZSrEZ6gGo\",\"touser\":\"\",\"url\":\""+lxbdcwjUrl+mzyReqrec.getPatientId()+"\"}",new Date());
|
|
|
+ throw new MzException("当前挂号的病人还未做新型冠状病毒感染流行病学史问卷,请告知病人及时前往填写！");
|
|
|
}
|
|
|
boolean temperature =false;
|
|
|
if(covidPojo.getTemperature()==2){
|
|
|
@@ -119,7 +119,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
|
|
|
temperature= feverNumber.compareTo(BigDecimal.valueOf(37.3)) >= 0;
|
|
|
}
|
|
|
if (temperature|| covidPojo.getItem1() != 14 || covidPojo.getItem2() != 24 || covidPojo.getItem3() != 32 || covidPojo.getItem4() != 42 || covidPojo.getItem5() != 52) {
|
|
|
- throw new MzException("当前病人流行病调查报告未通过，请挂发热门诊并告知病人");
|
|
|
+ throw new MzException("当前病人新型冠状病毒感染流行病学史问卷未通过，请挂发热门诊并告知病人");
|
|
|
}
|
|
|
}
|
|
|
Windows windows = windowsMapper.selectLastWindowsByUserIdCode(mzyReqrec.getOpId());
|
hurugang