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

@@ -9725,7 +9725,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        nvps.add(new BasicNameValuePair("accid", userId));
        YxTokenMappingDO yxTokenMappingDO1 = new YxTokenMappingDO();
        String response = httpClientUtil.headerPost(url,nvps,"UTF-8",httpPost);
        logger.info("返回日志"+response);
        logger.info("重置云信"+response);
        if(StringUtils.isNoneBlank(response)){
            com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
            if (jsonObject.getString("code").equalsIgnoreCase("200")){

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -872,6 +872,10 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                                    if (org.apache.commons.lang3.StringUtils.isNotBlank(realOrder)){
                                            sfResult = prescriptionService.getSFExpressInfoNew(admNo,realOrder,"");
                                    }
                                    String condition ="";
                                    if (StringUtils.isNoneBlank(admNo)){
                                        condition = " t.JZXH = '"+admNo+"' and";
                                    }
                                    if (!"".equals(sfResult)) {
                                        JSONObject json = JSONObject.parseObject(sfResult.toString());
                                        String sfOrder =  json.getString("mailNo");
@@ -879,7 +883,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                                        String updatesql = "update v_ms_dd01 t set t.PSFS = 1 ,t.FKZT=1 ,t.YFSB = 6 ,t.KDDH ='"+sfOrder+"',t.SJR = '"+wlyyPrescriptionExpressageDO.getName()+"' ," +
                                                " t.SJRDH = '"+wlyyPrescriptionExpressageDO.getMobile()+"' ,"+
                                                " t.SJRDZ = '"+wlyyPrescriptionExpressageDO.getAddress()+"'"+
                                                " where t.JZXH = '"+admNo+"' and t.CFSB ='"+realOrder+"'";
                                                " where "+condition+" t.CFSB ='"+realOrder+"'";
                                        ykyyEntranceService.updateHisStatus(updatesql);
                                        logger.info("更新his成功");
                                    }