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/hospital/prescription/service/PrescriptionService.java

@@ -9345,23 +9345,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else {
            BaseDoctorDO doctorDO = baseDoctorDao.findByIdcardAndId(idcard);
            if (price==-1){
                if (type==1){
                    if (StringUtils.isNoneBlank(doctorDO.getOutpatientType())) {
                        if (doctorDO.getOutpatientType().contains("zj")) {
                            doctorDO.getOutpatientType().replace(",zj", "");
                if (doctorDO!=null){
                    if (type==1){
                        if (StringUtils.isNoneBlank(doctorDO.getOutpatientType())) {
                            if (doctorDO.getOutpatientType().contains("zj")) {
                                doctorDO.getOutpatientType().replace(",zj", "");
                            }
                        }else {
                            doctorDO.setOutpatientType("zj");
                        }
                    }else {
                        doctorDO.setOutpatientType("zj");
                    }
                }else if (type==3){
                    if (StringUtils.isNoneBlank(doctorDO.getOutpatientType())) {
                        if (doctorDO.getOutpatientType().contains("zj")) {
                            doctorDO.getOutpatientType().replace(",zj", "");
                    }else if (type==3){
                        if (StringUtils.isNoneBlank(doctorDO.getOutpatientType())) {
                            if (doctorDO.getOutpatientType().contains("zj")) {
                                doctorDO.getOutpatientType().replace(",zj", "");
                            }
                        }else {
                            doctorDO.setOutpatientType("zj");
                        }
                    }else {
                        doctorDO.setOutpatientType("zj");
                    }
                }else {
                    if (doctorDO==null){
                        return "找不到医生信息！";
                    }
                }
            }else {
                if (doctorDO!=null){
                    if (!StringUtils.isNoneBlank(doctorDO.getYktDoctorId())){