Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -272,7 +272,7 @@ func SZHisManagerApiRegistRouters() {
 	//挂号
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
 	//上传明细，预结算
-	beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
+	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
 	//结算
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")