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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3261,6 +3261,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "AND outpatient.pay_status = 1 " +
                "AND outpatient.status = 0 ";
        //视频复诊，协同门诊 医生抢单
        if(type == 2 ){
@@ -4338,7 +4339,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "base_patient patient " +
                "WHERE " +
                "outpatient.patient=patient.id " +
                "AND outpatient.status in (0,1) " +
                "AND outpatient.status <> -1 " +
                "AND outpatient.doctor='"+doctor+"' " +
                "AND outpatient.outpatient_type= '"+outpatient_type+"' ";
        if("1".equals(outpatient_type)){//复诊

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -40,6 +40,7 @@ import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.im.ConsultVO;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.IdCardUtil;
@@ -791,6 +792,13 @@ public class ImService {
				//中山医院互联网医院
				if("xm_zsyy_wx".equals(wechat_appid)){
					accessToken = entranceService.getAccessToken("100033");
					
					net.sf.json.JSONObject object1 = net.sf.json.JSONObject.fromObject(accessToken);
					if (null != object1&&null!=object1.get("respCode") && "00".equals(object1.get("respCode"))) {
						accessToken  = object1.getJSONObject("respEntity").getString("access_token");
					} else {
						throw new Exception("获取ACCESSTOKEN失败");
					}
				}else{
					wxAccessTokenService.deleteByWechatId(wechat_appid);
					accessToken = wxAccessTokenService.updateAccessToken(wechat_appid);