Merge branch 'dev'

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -5,7 +5,6 @@ import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientReservation;
import com.yihu.wlyy.logs.BusinessLogs;
import com.yihu.wlyy.repository.message.SMSDao;
import com.yihu.wlyy.service.ZyDictDataService;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.reservation.PatientReservationService;
import com.yihu.wlyy.service.common.SMSService;
@@ -76,33 +75,7 @@ public class BookingController extends WeixinBaseController {
    private HttpClientUtil HttpClientUtil;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    ZyDictDataService zyDictJob;
    /**
     * 启动任务
     * @return
     */
    @RequestMapping(value = "test", method = RequestMethod.GET)
    @ApiOperation("获取智业字典列表")
    @ResponseBody
    public String test() {
        try {
//            zyDictJob.synchronizeZyCommonDict();
//            zyDictJob.synchronizeZ_iv_staff_dict();
//            zyDictJob.synchronizeZy_iv_dept_staff_allot_dict();
//            zyDictJob.synchronizeZy_iv_diagnose_class_dict();
//            zyDictJob.synchronizeZy_iv_org_physic_allot_dict();
//            zyDictJob.synchronizeZy_iv_physic_dict();
//            zyDictJob.synchronizeZy_iv_staff_reg_type_allot_dict();//
//            zyDictJob.synchronizeZy_iv_subject_class_dict();
            zyDictJob.synchronizeZy_iv_dept_dict();
            return success("获取智业字典列表成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取智业字典列表失败:" + e.getMessage());
        }
    }
    /**
     * 根据城市编码获取相应挂号服务