Merge remote-tracking branch 'origin/master'

liusheng

10 天以前 274d8e2950e79e73b14783e497cdaf97f7dbb8d3

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

@@ -96,12 +96,12 @@
    public int dealOutHospInfo(String config);

    /**
     * 处理从his取来的出院数据
     * 处理从his取来的出院数据 任务组生成
     *
     * @param
     * @return 结果
     */
    public int dealOutHospInfoByDimension(String config);
    public int dealOutHospInfoBySchedule(String config);

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