Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

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

@@ -1013,7 +1013,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    " AND t.start_time <='"+endDate+"'"+
                    " )";
        }
        sql += " LIMIT " + (page - 1) * size + "," + size + "";
        sql += " AND d.del='1'AND d.charge_type is not null LIMIT " + (page - 1) * size + "," + size + "";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        if(list!=null&&list.size()>0){
            //获取排班
@@ -2880,7 +2880,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
    
        if(StringUtils.isNotBlank(outpatientType)){
            sql+=" AND d.outpatient_type = '"+outpatientType+"' ";
            sql+=" AND d.outpatient_type like '%"+outpatientType+"%' ";
        }
    
        if(StringUtils.isNotBlank(keyName)){
@@ -2896,7 +2896,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            sql+=" AND d.consult_status = '"+consultStatus+"' ";
        }
    
        sql += " order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
        sql += " and d.del='1' and d.charge_type is not null order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize;
        
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        logger.info("findDoctorByHospitalAndDiseaseAndDept end:"+DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));

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

@@ -44,6 +44,7 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
@@ -53,6 +54,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -67,6 +69,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
/**
@@ -152,6 +155,9 @@ public class ImService {
	@Autowired
	private BaseDoctorRoleDao baseDoctorRoleDao;
	
	@Autowired
	private StringRedisTemplate redisTemplate;
	
	
	
	/**
@@ -2296,4 +2302,18 @@ public class ImService {
		result = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ConsultVO.class));
		return result;
	}
	
	/**
	 * 修改视频会话邀请状态
	 * @param session_id session_id
	 * @param status 1发起，0挂断
	 */
	public void changeVideoInviteStatus(String session_id,Integer status) throws Exception{
		if(1 == status){
			redisTemplate.opsForValue().set("video_invite_"+session_id,"1");
		}
		if(0== status){
			redisTemplate.opsForValue().set("video_invite_"+session_id,"0");
		}
	}
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -508,7 +508,12 @@ public class BaseHospitalRequestMapping {
    
        //医生端：医生提醒居民上线
        public static final String alertPatientOnline="alertPatientOnline";
    
        //医生端：发起/断开 会话视频邀请
        public static final String videoInviteStatus="videoInviteStatus";
    
        //医生端：查询会话视频邀请状态
        public static final String getVideoInviteStatus="getVideoInviteStatus";
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -25,6 +25,7 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.sms.service.ZhongShanSMSService;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -720,4 +721,25 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		return success("转发成功",wlyyBusinessService.wlyyMessageForward(senderIdcard,reciverIdcard,messageids,title,sessionType));
	}
	
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.videoInviteStatus)
	@ApiOperation(value = "医生端：发起/断开 会话视频邀请", notes = "医生端：发起/断开 会话视频邀请")
	public Envelop videoInviteStatus(@ApiParam(name = "session_id", value = "会话ID")
	                                  @RequestParam(value = "session_id",required = true) String session_id,
	                                 @ApiParam(name = "status", value = "会话ID:1发起，0挂断")
	                                 @RequestParam(value = "status",required = true) Integer status)throws Exception  {
		imService.changeVideoInviteStatus(session_id,status);
		return success("操作成功");
	}
	
	@GetMapping(value = BaseHospitalRequestMapping.DodtorIM.getVideoInviteStatus)
	@ApiOperation(value = "医生端：查询会话视频邀请状态", notes = "医生端：查询会话视频邀请状态")
	public Envelop getVideoInviteStatus(@ApiParam(name = "session_id", value = "会话ID")
	                                 @RequestParam(value = "session_id",required = true) String session_id)throws Exception  {
		String status = redisTemplate.opsForValue().get("video_invite_"+session_id);
		if(StringUtil.isBlank(status)){
			status = "0";
		}
		return success("查询成功",status);
		
	}
}

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital-lyx
    name:  svr-internet-hospital
  cloud:
    config:
      failFast: true