3 Commits 496d8b256f ... 81d865cebe

Author SHA1 Message Date
  huangwenjie 81d865cebe Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev 4 years ago
  huangwenjie 461b37faa0 Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev 4 years ago
  huangwenjie c264849ac6 代码提交 4 years ago

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

@ -186,9 +186,10 @@ public class ImService {
	 * @param pagesize 分页大小
	 * @param title 标题关键字
	 * @param status 状态
	 * @param doctorName 医生名字
	 * @return
	 */
	public List<Map<String,Object>>  findConsultRecordByPatient(String patient, String id,String type, int page,int pagesize, String title,Integer status,Integer payStatus) {
	public List<Map<String,Object>>  findConsultRecordByPatient(String patient, String id,String type, int page,int pagesize, String title,Integer status,Integer payStatus,String doctorName) {
		
		
		String  sql = "SELECT " +
@ -223,6 +224,11 @@ public class ImService {
			sql +=" and a.title like '"+title+"'";
		}
		
		if(!StringUtils.isEmpty(doctorName)){
			title="%"+doctorName+"%";
			sql +=" and d.name like '"+title+"'";
		}
		
		//咨询状态
		if(status != null && status != 0){
			

+ 4 - 2
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@ -138,9 +138,11 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
								@ApiParam(name = "page", value = "第几页")
								@RequestParam(value = "page",required = false) int page,
								@ApiParam(name = "pagesize", value = "分页大小")
								@RequestParam(value = "pagesize",required = false) int pagesize
								@RequestParam(value = "pagesize",required = false) int pagesize,
								@ApiParam(name = "doctorName", value = "医生名字")
								@RequestParam(value = "doctorName",required = false) String doctorName
								)throws Exception{
		List<Map<String,Object>>  data = imService.findConsultRecordByPatient(patient, id,type, page,pagesize, title,status,payStatus);
		List<Map<String,Object>>  data = imService.findConsultRecordByPatient(patient, id,type, page,pagesize, title,status,payStatus,doctorName);
		
		/*if (data != null) {
			for (ConsultVO consult : data) {