Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

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

@@ -84,7 +84,6 @@ import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WxPushLogDao;
import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.service.BaseSensitiveFilterWordsService;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.yihu.mysql.query.BaseJpaService;
@@ -7528,10 +7527,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        xzyyPrescriptionService.SOF_SignDataWithExtraInfoEmr(wlyyPrescriptionDO);
                    }
                    if (object!=null){
                        //推送模板消息
                        if (object.getString("code").toString().equalsIgnoreCase("0")) {
                            com.alibaba.fastjson.JSONObject jsonObject2 = object.getJSONObject("data");
                            com.alibaba.fastjson.JSONObject jsonObject1 = jsonObject2.getJSONObject("PresDetail");
                        if (object.getString("code").equalsIgnoreCase("0")){
                            //  * @param applyDepaName @param applyDoctorName
                            WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
                            String patientCode = outpatientDO.getConsumer();
@@ -7543,7 +7539,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            if (doctorHospitalDOS != null && doctorHospitalDOS.size() != 0) {
                                applyDepaName = doctorHospitalDOS.get(0).getDeptName();
                            }
                            String voucherNo = jsonObject1.get("voucherNo") + "";
                            String voucherNo = outpatientDO.getRegisterNo();
                            String applyDoctorName = prescriptionDO.getDoctorName();
                            BasePatientDO patientDO = basePatientDao.findById(patientCode);
                            String userName = null;
@@ -7574,7 +7570,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        }
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                }