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

@@ -906,8 +906,10 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                        for (WaitPayDetailVO waitPayDetailVO1:listWPD){
                                            if (waitPayDetailVO1.getItemName().equalsIgnoreCase("互联网医院复诊诊查费")){
                                                WlyyOutpatientDO wlyyOutpatientDO1 = outpatientDao.findByRealOrder(waitPayDetailVO1.getRecipeNo());
                                                wlyyOutpatientDO1.setHisStatus(1);
                                                outpatientDao.save(wlyyOutpatientDO1);
                                                if (wlyyOutpatientDO1!=null){
                                                    wlyyOutpatientDO1.setHisStatus(1);
                                                    outpatientDao.save(wlyyOutpatientDO1);
                                                }
                                            }
                                        }
                                        logger.info("处方结算成功"+pushPayLog+"====="+waitPayDetailVO.getRecipeNo());