Merge branch 'master' of chenweida/esb into master

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/StdMetadataController.java

@@ -125,6 +125,7 @@ public class StdMetadataController extends BaseController {
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        if (StringUtil.isEmpty(initMetadataNm)) {
            initMetadataNm = "";
        }
        if(StringUtil.isEmpty(q)){