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

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -92,7 +92,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
    public String orgSub ;
    public String imgUrl;
    static String imgPath =File.separator+"usr"+File.separator+"local"+File.separator+"ehr"+File.separator+"svr-internet-hospital-job"+File.separator+"img"+File.separator;
    static String imgPath =File.separator+"usr"+File.separator+"local"+File.separator+"hospital"+File.separator+"svr-internet-hospital-job"+File.separator+"img"+File.separator;
    public ObjectMapper objectMapper;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -858,12 +858,22 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId());
                                        if (wlyyOutpatientDO.getHisStatus()==null){
                                            fee=(prescriptionDO.getDrugFee()+wlyyOutpatientDO.getFee())+"";
                                            title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！结算费用包含本次在线问诊的复诊诊查费：15元。";
                                            if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                                                title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！结算费用包含本次在线问诊的复诊诊查费："+wlyyOutpatientDO.getFee()+"元。";
                                            }else if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                                                title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！结算费用包含本次在线问诊的复诊诊查费："+wlyyOutpatientDO.getFee()+"元。";
                                            }
                                        }else {
                                            fee=prescriptionDO.getDrugFee()+"";
                                            title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！";
                                            if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                                                title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！";
                                            }
                                        }
                                        String pushPayLog = null;
                                        if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                                            pushPayLog = payInfoNoticeService.pushPrescriptionPay(wlyyOutpatientDO.getConsumer(),prescriptionDO.getDoctorName(),voucherNo,prescriptionDO.getOutpatientId(),prescriptionDO.getId(),fee,title,null);
                                        }
                                        String pushPayLog = payInfoNoticeService.pushPrescriptionPay(wlyyOutpatientDO.getConsumer(),prescriptionDO.getDoctorName(),voucherNo,prescriptionDO.getOutpatientId(),prescriptionDO.getId(),fee,title,null);
                                        WlyyPrescriptionLogDO prescriptionLogDO = new WlyyPrescriptionLogDO();
                                        prescriptionLogDO.setCreateTime(new Date());
                                        prescriptionLogDO.setStatus(30);
@@ -894,9 +904,11 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                        if (wlyyOutpatientDO!=null){
                                            if (wlyyOutpatientDO.getHisStatus()==null){
                                                String fee=wlyyOutpatientDO.getFee()+"";
                                                String title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！";
                                                String url = "https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId="+wlyyOutpatientDO.getId()+"";
                                                payInfoNoticeService.pushPrescriptionPay(wlyyOutpatientDO.getConsumer(),wlyyOutpatientDO.getDoctorName(),waitPayDetailVO.getVoucherNo(),null,null,fee,title,url);
                                                if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                                                    String title="您在厦门大学附属中山医院有一笔诊察/处方费用已支付完成！";
                                                    String url = "https://hlwyy.xmzsh.com/ims-wx/index.html#/returnVisit/record?outpatientId="+wlyyOutpatientDO.getId()+"";
                                                    payInfoNoticeService.pushPrescriptionPay(wlyyOutpatientDO.getConsumer(),wlyyOutpatientDO.getDoctorName(),waitPayDetailVO.getVoucherNo(),null,null,fee,title,url);
                                                }
                                                outpatientDao.updateHisStatusById(wlyyOutpatientDO.getId(),1);
                                                logger.info("更新门诊结算状态");
                                            }