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

@@ -2334,7 +2334,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        
        //获取今天的排班列表
        String doctorsql ="SELECT doctor,doctor_name FROM wlyy_doctor_work_time WHERE date='"+date+"'";
        String doctorsql ="SELECT doctor,doctor_name,dept,dept_name FROM wlyy_doctor_work_time WHERE date='"+date+"'";
        
        if(StringUtils.isNoneBlank(dept)){
            doctorsql = doctorsql + " and dept = '"+dept+"' ";
@@ -2351,8 +2351,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    
            if(StringUtils.isNoneBlank((String)doctorlist.get(0).get("doctor_name"))){
                jsonObject.put("doctor_name",(String)doctorlist.get(0).get("doctor_name"));
                jsonObject.put("dept_name",(String)doctorlist.get(0).get("dept_name"));
                jsonObject.put("dept_code",(String)doctorlist.get(0).get("dept"));
            }else{
                jsonObject.put("doctor_name","");
                jsonObject.put("dept_name","");
                jsonObject.put("dept_code","");
            }
            jsonObject.put("visit_status",0);
            jsonObject.put("waiting_count",0);
@@ -2935,6 +2939,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "patient.idcard AS idcard," +
                "patient.photo AS photo," +
                "patient.birthday AS birthday," +
                "patient.mobile AS mobile," +
                "room.consult_type AS consult_type," +
                "date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS time," +
                "date_format(room.reservation_time ,'%Y-%m-%d' ) AS group_date," +
@@ -2977,6 +2982,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    _cu.add(outpatient);
                    waitinglist.put(group_date,_cu);
                }
    
                //全科医生来源
                outpatient.put("general_doctor_info","");//全科医生名字
                outpatient.put("general_doctor_hospital","");//全科医生社区
                outpatient.put("alert_tag",0);//是否已提醒
                outpatient.put("online_tag",0);//在线状态
            }
        }
    

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

@@ -1642,7 +1642,14 @@ public class ImService {
		}else{
			JSONObject participants = new JSONObject();
			participants.put(patientCode,0);
			JSONObject sessionJson  = imUtil.createSession(participants,imUtil.SESSION_TYPE_GUIDANCE_HOSPITAL,"居民求助导诊护士",session_id);
			BasePatientDO basePatientDO = basePatientDao.findById(patientCode);
			String patientSex = "";
			if(1 == basePatientDO.getSex()){
				patientSex= "男";
			}else{
				patientSex= "女";
			}
			JSONObject sessionJson  = imUtil.createSession(participants,imUtil.SESSION_TYPE_GUIDANCE_HOSPITAL,"居民 "+basePatientDO.getName()+" "+patientSex,session_id);
			if(sessionJson.getInteger("status") ==-1){
				throw  new RuntimeException(sessionJson.getString("message"));
			}else{

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

@@ -440,6 +440,9 @@ public class BaseHospitalRequestMapping {
    
        //医生端：可抢单数量
        public static final String doctorPickCount="doctorPickCount";
    
        //医生端：医生提醒居民上线
        public static final String alertPatientOnline="alertPatientOnline";
    }
    /**

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

@@ -96,7 +96,9 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "dept", value = "部门CODE")
			@RequestParam(value = "dept",required = false) String dept,
			@ApiParam(name = "date", value = "日期")
			@RequestParam(value = "date",required = false) String date){
			@RequestParam(value = "date",required = false) String date,
			@ApiParam(name = "consult_status", value = "0离线，1空闲，2接诊中")
			@RequestParam(value = "consult_status",required = false) String consult_status){
//		String result = "[{\"id\":\"XXD2019887711\",\"doctor_name\":\"蔡建春\",\"visit_status\":0,\"patient_name\":\"张三\",\"visit_time\":\"2019-06-21 08:30:00\",\"time_cost\":50,\"waiting_count\":26,\"room_name\":\"01诊室\"},{\"id\":\"XXD2019887712\",\"doctor_name\":\"蔡阿梅\",\"visit_status\":1,\"patient_name\":\"李四\",\"visit_time\":\"2019-06-21 09:30:00\",\"time_cost\":60,\"waiting_count\":33,\"room_name\":\"02诊室\"}]";
		return success("请求成功",prescriptionService.findClinicRoomList(dept,date));
	}
@@ -104,9 +106,11 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	@GetMapping(value = BaseHospitalRequestMapping.DodtorIM.findClinicRoomStatus)
	@ApiOperation(value = "查询单个医生诊室状态", notes = "查询单个医生诊室状态")
	public Envelop findClinicRoomStatus(
			@ApiParam(name = "doctorCode", value = "医生CODE")
			@RequestParam(value = "doctorCode",required = true) String doctorCode){
//		String result = "{\"id\":\"XXD2019887711\",\"doctor_name\":\"蔡建春\",\"visit_status\":0,\"patient_name\":\"张三\",\"visit_time\":\"2019-06-21 08:30:00\",\"waiting_count\":26}";
			@ApiParam(name = "doctor_code", value = "医生CODE")
			@RequestParam(value = "doctor_code",required = true) String doctorCode,
			@ApiParam(name = "dept_code", value = "部门CODE")
			@RequestParam(value = "dept",required = false) String dept){
		String result = "{\"id\":\"402803816babc778016babca6d540008\"\"doctor_name\":\"梁敬兴\",\"visit_status\":0,\"patient_name\":\"白海灵\",\"visit_time\":\"2019-09-30 08:30:00\",\"time_cost\":50,\"waiting_count\":26,\"room_name\":\"01诊室\"，\"dept_code\":'1190007',\"dept_name\":'急诊外科',\"visit_count\":2,\"ending_count\":0,\"offline_count\":2,}";
//		JSONObject obj = JSON.parseObject(result);
		return success("请求成功",prescriptionService.findClinicRoomStatus(doctorCode));
	}
@@ -512,4 +516,13 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	}
	
	
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.alertPatientOnline)
	@ApiOperation(value = "医生提醒居民上线", notes = "医生提醒居民上线")
	public Envelop alertPatientOnline(@ApiParam(name = "patient", value = "居民CODE")
	                                         @RequestParam(value = "patient",required = true) String patient) {
		
		return success("操作成功");
	}
	
	
}