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

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

@@ -2389,7 +2389,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "WHERE " +
                "room.patient_id=patient.id " +
                "AND room.outpatient_id=outpatient.id " +
                "AND outpatient.dept='"+dept+"' "+
                "AND outpatient.status = 0 ";
        //视频复诊，协同门诊 医生抢单
        if(type == 2 ){
@@ -2407,10 +2406,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        
        //协同门诊
        if(3 == type){
            sql += "AND room.reservation_type=2 ";
            sql += " AND room.reservation_type=2 ";
        }else{
            //在线复诊
            sql += "AND room.reservation_type=1 AND room.consult_type="+type ;
            sql += " AND room.reservation_type=1 AND room.consult_type="+type ;
        }
        
        if(StringUtils.isNoneBlank(dept)){
            sql += " AND outpatient.dept='"+dept+"' ";
        }
        
        

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

@@ -78,7 +78,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "query_status", value = "0:图文复诊候诊 1:图文复诊抢单列表")
			@RequestParam(value = "",required = false) Integer query_status,
			@ApiParam(name = "dept", value = "部门")
			@RequestParam(value = "",required = true) String dept){
			@RequestParam(value = "",required = false) String dept){
		return success("请求成功",prescriptionService.findWaitingRoomOutpatientByDoctor(doctor,type,query_status,dept));
	}