Merge remote-tracking branch 'origin/master'

liusheng

昨天 d1533f3fe617a98eb8782047e4c4ad81f3924fcf

 smartor/src/main/java/com/smartor/service/IPatMedInhospService.java

@@ -90,7 +90,7 @@
     * @param
     * @return 结果
     */
    public int dealOutHospInfo();
    public int dealOutHospInfo(String config);

    /**
     * 获取出院，住院，门诊服务人次