Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/third/wlyy/MonitoringHealthPlatformController.java

@@ -78,6 +78,8 @@ public class MonitoringHealthPlatformController extends BaseController{
    public String searchPatient(
            @ApiParam(name="name",value="姓名")
            @RequestParam(value="name",required = false) String name,
            @ApiParam(name="idcards",value="身份证(多个用逗号间隔)")
            @RequestParam(value="idcards",required = false) String idcards,
            @ApiParam(name="page",value="第几页(默认第一页)",defaultValue = "1")
            @RequestParam(value="page",required = false) Integer page,
            @ApiParam(name="pageSize",value="每页几行(默认10条记录)",defaultValue = "10")
@@ -89,7 +91,7 @@ public class MonitoringHealthPlatformController extends BaseController{
            if(pageSize==null){
                pageSize = 10;
            }
            return monitoringHealthService.searchPatient(name,page,pageSize);
            return monitoringHealthService.searchPatient(name,page,pageSize,idcards);
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/third/wlyy/MonitoringHealthService.java

@@ -198,12 +198,13 @@ public class MonitoringHealthService extends BaseService{
     * @param pageSize
     * @return
     */
    public String searchPatient(String name,Integer page,Integer pageSize){
    public String searchPatient(String name,Integer page,Integer pageSize,String idcards){
        String url = "/wlyygc/iot_monitoring/searchPatient";
        Map<String, Object> params = new HashMap<>();
        params.put("name",name);
        params.put("page",page);
        params.put("pageSize",pageSize);
        params.put("idcards",idcards);
        return sendGet(url,params);
    }