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

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

@@ -1215,7 +1215,7 @@ public class ImService {
			BaseDoctorDO d = baseDoctorDao.findById(endOperator);
			if (endOperator.equals("admin")) {
				endId = "system";
				endName = "咨询超时未回复，系统自动";
				endName = "超时，系统自动结束";
			} else {
				endId = d.getId();
				endName = d.getName();
@@ -1918,12 +1918,14 @@ public class ImService {
				"d.id as patientId," +
				"d.idcard as patientIdcard," +
				"d.sex as patientsex," +
				"d.photo AS patientphoto " +
				"d.photo AS patientphoto, " +
				"doctor.job_title_name AS jobTitleName " +
				"FROM wlyy_consult a," +
				"wlyy_consult_team b," +
				"base_doctor doctor," +
				"base_patient d " +
				"WHERE a.id=b.consult " +
				"AND b.patient=d.id AND b.patient='"+patinet+"' "+
				"AND b.patient=d.id AND b.doctor = doctor.id AND b.patient='"+patinet+"' "+
				"AND b.actual_sender='"+doctor+"' ";
		List<ConsultVO> result = new ArrayList<>();
		

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

@@ -31,6 +31,9 @@ public class ConsultVO extends UuidIdentityVO {
	@ApiModelProperty(value = "是否评价 1、已评价 0、未评价'", example = "模块1")
	private Integer evaluate;
	
	@ApiModelProperty(value = "医生id", example = "模块1")
	private String doctorCode;
	
	@ApiModelProperty(value = "医生头像", example = "模块1")
	private String doctorphoto;
	

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/PrescriptionStatusUpdateService.java

@@ -278,10 +278,15 @@ public class PrescriptionStatusUpdateService {
                for(WlyyOutpatientDO outpatientDO:outpatientDOs){
                    //结束门诊
                    outpatientDO.setStatus("2");
    
                    //TODO:结束咨询
                    String consultCode = imService.getConsultCodeByOutpatientId(outpatientDO.getId());
                    if(StringUtils.isNoneBlank(consultCode)){
                        imService.finish(consultCode,"admin",2);
                    }
                }
                outpatientDao.save(outpatientDOs);
                //TODO:结束咨询
                logger.info("setOutPatientOver count :"+outpatientDOs.size());
            }else {

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

@@ -3,8 +3,11 @@ package com.yihu.jw.hospital.endpoint.consult;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
@@ -58,6 +61,9 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	
	@Autowired
	private WlyyBusinessService wlyyBusinessService;
	
	@Autowired
	private BaseDoctorHospitalDao baseDoctorHospitalDao;
	
	
@@ -577,6 +583,23 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
					json.put("generalDoctorName", baseDoctorDO.getName());
				}
				
				List<BaseDoctorHospitalDO> hospitalDOs =  baseDoctorHospitalDao.findByDoctorCode(doctor);
				if(hospitalDOs!=null&&hospitalDOs.size()>0){
					json.put("hospital",hospitalDOs.get(0));
//					BaseOrgDO org = baseOrgDao.findByCode(hospitalDOs.get(0).getOrgCode());
//					rs.put("winNo",org.getWinNo());
//					json.put("deptName",hospitalDOs.get(0).getDeptName());
//					json.put("dept",hospitalDOs.get(0).getDeptCode());
				}else{
					json.put("hospital",null);
//					json.put("winNo",null);
//					json.put("deptName",null);
//					json.put("dept",null);
				}
				
				//医生职称
				json.put("jobTitleName", consult.getJobTitleName());
				
				// 设置显示标题
				json.put("title", consult.getTitle());
				// 设置主诉