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

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

@@ -2220,26 +2220,60 @@ public class ImService {
	 * @return
	 */
	public List<ConsultVO> doctorUpcomingList(String doctorCode, String type) {
		
		String  sql = "SELECT " +
				"a.id AS id," +
				"a.type AS type," +
				"a.title AS title," +
				"a.symptoms AS symptoms," +
				"a.czrq AS czrq," +
				"b.status AS status," +
				"b.evaluate AS evaluate," +
				"d.name AS patientName," +
				"d.id as patientId," +
				"d.idcard as patientIdcard," +
				"d.sex as patientsex," +
				"d.photo AS patientphoto " +
				"FROM wlyy_consult a," +
				"wlyy_consult_team b," +
				"base_patient d  " +
				"WHERE a.id=b.consult " +
				"AND b.patient=d.id AND b.doctor='"+doctorCode+"' AND b.type in ("+type+") and b.status = 0  " +
				"ORDER BY a.czrq desc ";
		String sql = "";
		if("1,15".equals(type)) {
			sql = "SELECT " +
					"a.id AS id," +
					"a.type AS type," +
					"a.title AS title," +
					"a.symptoms AS symptoms," +
					"a.czrq AS czrq," +
					"b.status AS status," +
					"b.evaluate AS evaluate," +
					"b.doctor AS doctorCode," +
					"b.actual_sender AS generalDoctor," +
					"d.name AS patientName," +
					"d.id as patientId," +
					"d.idcard as patientIdcard," +
					"d.sex as patientsex," +
					"d.photo AS patientphoto " +
					"FROM wlyy_consult a," +
					"wlyy_consult_team b," +
					"base_patient d  " +
					"WHERE a.id=b.consult " +
					"AND b.patient=d.id AND b.doctor='" + doctorCode + "' AND b.type in (" + type + ") and b.status = 0  " +
					"ORDER BY a.czrq desc ";
		}
		if("9".equals(type) || "16".equals(type)|| "12".equals(type)){
			sql = "SELECT " +
					"op.description AS title," +
					"op.description AS symptoms," +
					"op.create_time AS czrq," +
					"op.status AS status," +
					"op.evaluate_status AS evaluate," +
					"op.doctor AS doctorCode," +
					"op.general_doctor AS generalDoctor," +
					"patient.NAME AS patientName," +
					"patient.id AS patientId," +
					"patient.idcard AS patientIdcard," +
					"patient.sex AS patientsex," +
					"patient.photo AS patientphoto," +
					"op.id AS outpatientid," +
					"op.register_date AS registerDate," +
					"op.status AS outpatientstatus " +
					"FROM wlyy_outpatient op," +
					"base_patient patient " +
					"WHERE op.patient=patient.id " +
					"AND op.doctor='"+doctorCode+"' " +
					"AND op.status in ('0','1') ";
			if("9".equals(type)){//图文复诊
				sql =sql +"AND op.type=1 ";
			}else if("16".equals(type)){
				//视频复诊
				sql =sql +"AND op.type=2 ";
			}else{}
			sql =sql +"ORDER BY op.create_time DESC";
		}
		
		List<ConsultVO> result = new ArrayList<>();
		result = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ConsultVO.class));

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/im/ConsultVO.java

@@ -62,6 +62,12 @@ public class ConsultVO extends UuidIdentityVO {
	@ApiModelProperty(value = "就诊记录ID", example = "模块1")
	private String outpatientid;
	
	@ApiModelProperty(value = "就诊记录状态", example = "模块1")
	private String outpatientstatus;
	
	@ApiModelProperty(value = "就诊预约时间", example = "模块1")
	private Date registerDate;
	
	@ApiModelProperty(value = "1图文，2视频", example = "模块1")
	private String consultType;
	
@@ -214,4 +220,28 @@ public class ConsultVO extends UuidIdentityVO {
	public void setIcd10Name(String icd10Name) {
		this.icd10Name = icd10Name;
	}
	
	public String getDoctorCode() {
		return doctorCode;
	}
	
	public void setDoctorCode(String doctorCode) {
		this.doctorCode = doctorCode;
	}
	
	public String getOutpatientstatus() {
		return outpatientstatus;
	}
	
	public void setOutpatientstatus(String outpatientstatus) {
		this.outpatientstatus = outpatientstatus;
	}
	
	public Date getRegisterDate() {
		return registerDate;
	}
	
	public void setRegisterDate(Date registerDate) {
		this.registerDate = registerDate;
	}
}

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

@@ -517,8 +517,10 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	                                       @RequestParam(value = "doctor",required = true) String doctor){
		//专家咨询
		Integer zjCount = imService.sessionCountByType(doctor,1,0);
		//全科医生求助专科
		Integer zjqzCount = imService.sessionCountByType(doctor,15,0);
		JSONObject result = new JSONObject();
		result.put("zjCount",zjCount);//专家咨询数量
		result.put("zjCount",zjCount+zjqzCount);//专家咨询数量
		return success("请求成功",result);
	}
	

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -863,10 +863,31 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                json.put("patientAge", DateUtil.getAgeForIdcard(consult.getPatientIdcard()));
                //就诊记录ID
                json.put("outpatientId", consult.getOutpatientid());
                //就诊记录状态
                json.put("outpatientstatus", consult.getOutpatientstatus());
                // 设置咨询日期
                json.put("registerDate", DateUtil.dateToStrLong(consult.getRegisterDate()));
                //图文或者视频类型
                json.put("consultType", consult.getConsultType());
                //诊断
                json.put("icd10Name", consult.getIcd10Name());
                
                if("1,15".equals(type)){//专家咨询
                    if(1 == consult.getType()){//专家咨询
                        json.put("session_id", consult.getPatientId()+"_"+ consult.getDoctorCode()+"_1");
                    }else if(15 == consult.getType()){//家医求助
                        json.put("session_id", consult.getPatientId()+"_"+ consult.getGeneralDoctor()+"_"+ consult.getDoctorCode()+"_15");
                    }else{}
                }else if("9".equals(type)){//图文复诊
                    json.put("session_id", consult.getPatientId()+"_"+ consult.getOutpatientid()+"_9");
                    json.put("type",type);
                }else if("16".equals(type)){//视频复诊
                    json.put("session_id", consult.getPatientId()+"_"+ consult.getOutpatientid()+"_16");
                    json.put("type",type);
                }else if("12".equals(type)){//协同门诊
                    json.put("session_id", consult.getPatientId()+"_"+ consult.getOutpatientid()+"_12");
                    json.put("type",type);
                }else{}
            
                array.add(json);
            }