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

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

@@ -936,9 +936,11 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                        }
                                    }else {
                                        WlyyOutpatientDO wlyyOutpatientDO1 = outpatientDao.findByRealOrder(waitPayDetailVO.getRecipeNo());
                                        wlyyOutpatientDO1.setHisStatus(1);
                                        outpatientDao.save(wlyyOutpatientDO1);
                                        logger.info("更新门诊结算状态");
                                        if (wlyyOutpatientDO1!=null){
                                            wlyyOutpatientDO1.setHisStatus(1);
                                            outpatientDao.save(wlyyOutpatientDO1);
                                            logger.info("更新门诊结算状态");
                                        }
                                    }
                                }
                                prescriptionDao.updateStatusByRealOrder(waitPayDetailVO.getRecipeNo(),30,new Date());