Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

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

@@ -42,7 +42,7 @@
    /**
     * 门急诊信息
     *
     * @param id
     * @param patMedOuthosp
     * @return
     */
    public Integer selectPatMedOuthospList(PatMedOuthosp patMedOuthosp);