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

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

@@ -2576,43 +2576,32 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param doctor
     * @return
     */
    public JSONObject doctorIndexConsultCount(String doctor) {
    public Long doctorIndexConsultCount(String doctor) {
    
        //医生问诊量
        List<WlyyOutpatientDO> wlyyOutpatientDOs = outpatientDao.findByDoctor(doctor);
        
        Integer imgCount = 0;
        
        Integer videoCount = 0;
        
        for(WlyyOutpatientDO wlyyOutpatientDO:wlyyOutpatientDOs){
            //1.图文 2.视频
            if("1".equals(wlyyOutpatientDO.getType())){
                imgCount ++;
            }else if("2".equals(wlyyOutpatientDO.getType())){
                videoCount ++;
            }else{
                continue;
            }
        }
    
        String totalSql = "SELECT count(a.id) AS total " +
                "FROM wlyy_consult a,wlyy_consult_team b " +
                "WHERE a.id=b.consult AND b.doctor='"+doctor+"' AND a.type=1 AND b.`status`=0";
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        String sql ="SELECT " +
                "count(room.outpatient_id) AS total " +
                "FROM " +
                "wlyy_hospital_waiting_room room," +
                "base_patient patient," +
                "wlyy_outpatient outpatient, " +
                "wlyy_consult_team consult " +
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "AND consult.relation_code=outpatient.id " +
                "AND consult.status = 0 " +
                "AND room.doctor='"+doctor+"' " +
                "AND room.consult_type= 2";
    
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(sql);
    
        Long zjCount = 0L;
        Long videoOnlineCount = 0l;
        if (rstotal != null && rstotal.size() > 0) {
            zjCount = (Long) rstotal.get(0).get("total");
            videoOnlineCount = (Long) rstotal.get(0).get("total");
        }
        
        JSONObject result = new JSONObject();
        result.put("imgCount",imgCount);
        result.put("videoCount",videoCount);
        result.put("zjCount",zjCount);
        
        return result;
    
        return videoOnlineCount;
        
    }
    
@@ -2681,4 +2670,34 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return result;
    }
    
    /**
     * 获取候诊居民数量
     * @param doctor
     * @return
     */
    public Long getWaitVideoCount(String doctor) {
        String sql ="SELECT " +
                "count(room.outpatient_id) AS total " +
                "FROM " +
                "wlyy_hospital_waiting_room room," +
                "base_patient patient," +
                "wlyy_outpatient outpatient " +
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "AND outpatient.status = 0 " +
                "AND room.doctor='"+doctor+"' " +
                "AND room.reservation_time is not null " +
                "AND room.consult_type= 2 ";
    
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(sql);
    
        Long waitVideoCount = 0l;
        if (rstotal != null && rstotal.size() > 0) {
            waitVideoCount = (Long) rstotal.get(0).get("total");
        }
    
        return waitVideoCount;
    }
}

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

@@ -1315,4 +1315,14 @@ public class ImService {
			return scoreList;
		}
	}
	
	/**
	 *按会话类型获取会话总数
	 * @param userid
	 * @param type
	 * @return
	 */
	public Integer sessionCountByType(String userid,Integer type){
		return imUtil.sessionCountByType(userid,type);
	}
}

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

@@ -524,7 +524,6 @@ public class ImUtil {
		} catch (Exception e) {
			return null;
		}
		
	}
	
	/**
@@ -630,6 +629,7 @@ public class ImUtil {
		}
	}
	
	
	/**
	 * 根据session和userid获取单个会话
	 * @param sessionId
@@ -677,4 +677,22 @@ public class ImUtil {
	public static final String SESSION_STATUS_END = "1";
	
	public static final String CONTENT_TYPE_TEXT = "1";
	
	
	/**
	 *按会话类型获取会话总数
	 * @param userid
	 * @param type
	 * @return
	 */
	public Integer sessionCountByType(String userid,Integer type){
		String url = im_host + "api/v2/sessions/sessionCountByType?user_id="+userid+"&type="+type;
		String ret = HttpClientUtil.get(url,"utf-8");
		JSONObject obj = JSON.parseObject(ret);
		if(obj.getInteger("status") ==200){
			return obj.getInteger("count");
		}else{
			return 0;
		}
	}
}

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * @author huangwenjie
 */
@@ -222,7 +223,35 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	@ApiOperation(value = "复诊图文咨询人数，视频咨询人数", notes = "复诊图文咨询人数，视频咨询人数")
	public Envelop doctorIndexConsultCount(@ApiParam(name = "doctor", value = "医生CODE")
	                                           @RequestParam(value = "doctor",required = true) String doctor){
		return success("请求成功",prescriptionService.doctorIndexConsultCount(doctor));
		
		//专家咨询
		Integer zjCount = imService.sessionCountByType(doctor,1);
		
		//复诊咨询
		Integer imgCount = imService.sessionCountByType(doctor,9);
		//正在进行中的视频复诊
		Long _videoOnlineCount = prescriptionService.doctorIndexConsultCount(doctor);
		Integer videoCount = _videoOnlineCount.intValue();
		
		//获取候诊居民数量（包含进行中的）
		Long _waitVideoCount = prescriptionService.getWaitVideoCount(doctor);
		Integer waitVideoCount = _waitVideoCount.intValue();
		
		JSONObject result = new JSONObject();
		result.put("zjCount",zjCount);
		
		imgCount = imgCount - videoCount;
		if(imgCount <=0){
			imgCount = 0;
		}
		
		result.put("zjCount",zjCount);
		result.put("imgCount",imgCount);
		result.put("videoCount",waitVideoCount+_videoOnlineCount);
		
		
		return success("请求成功",result);
	}
	
	

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

@@ -232,7 +232,7 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://172.26.0.105:3000/
  im_list_get: http://172.16.1.42:3000/
  data_base_name: im
# 上传文件临时路径配置