Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -206,7 +206,7 @@ public class ImService {
		}
		
		//咨询状态
		if(status != 0){
		if(status != null && status != 0){
			
			if(status ==2 ){//就诊中
				sql +=" and b.status = 0 ";

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

@@ -671,5 +671,6 @@ public class BaseHospitalRequestMapping {
        public static final String findByHosAndDict="/findByHosAndDict";
        public static final String findDoctorInfo="/findDoctorInfo";
        public static final String isExistsUnfinishedConsult ="/isExistsUnfinishedConsult";
        public static final String getJobBySaasId ="/getJobBySaasId";
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -1,5 +1,7 @@
package com.yihu.jw.hospital.endpoint.patient;
import com.yihu.jw.dict.service.BaseDictJobTitleService;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.hospital.service.consult.SysDictService;
import com.yihu.jw.im.service.ImService;
@@ -44,6 +46,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    private SysDictService sysDictService;
    @Autowired
    private ImService imService;
    @Autowired
    private BaseDictJobTitleService baseDictJobTitleService;
@@ -151,4 +155,22 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    }
    /**
     * 获取机构职称信息
     * @return
     */
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.getJobBySaasId)
    @ApiOperation(value = "获取机构职称信息", notes = "基础数据获取")
    public Envelop getJobBySaasId(
            @ApiParam(name = "saasId", value = "租户ID，当为空的情况下查询所有")
            @RequestParam(value = "saasId", required = false) String saasId)  {
        List<DictJobTitleDO> res= baseDictJobTitleService.getBySaasId(saasId);
        if(res != null && res.size() > 0 ){
            return  success(res);
        }else{
            return success("无法获取该机构的职称信息！");
        }
    }
}