Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ca27ff0d65
|
|
@ -45,7 +45,7 @@ public class HealthPersonInfoController extends BaseController {
|
|||
@GetMapping("/list")
|
||||
public TableDataInfo list(HealthPersonInfo healthPersonInfo) {
|
||||
startPage();
|
||||
System.out.println(healthPersonInfo.getPlaceIds());
|
||||
System.out.println(healthPersonInfo.getDeptIds());
|
||||
List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,4 +174,6 @@ public class HealthPersonInfo extends BaseEntity {
|
|||
private Date updateTime;
|
||||
private String doctorAdvices;
|
||||
private String placeIds;
|
||||
private String deptIds;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="doctorAdvices != null and doctorAdvices != ''">
|
||||
and b.doctor_advice in (${doctorAdvices})
|
||||
</if>
|
||||
<if test="deptIds != null and deptIds != ''">
|
||||
and a.dept_id in (${deptIds})
|
||||
</if>
|
||||
group by a.user_id,
|
||||
a.nick_name,
|
||||
a.dept_id,
|
||||
|
|
|
|||
Loading…
Reference in New Issue